X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gnulib%2Fupdate-gnulib.sh;h=f539647d03aed266d5545b66073e4fb0aba6eae6;hb=8c74a764f2cf5ea5e6997e35ba0f755fe2c09889;hp=db6a115628dfa53d4e6fd7c2b594b21900ed981d;hpb=5abebf3c3fd28a148e43be587c4e4065a0e53ae9;p=deliverable%2Fbinutils-gdb.git diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh index db6a115628..f539647d03 100755 --- a/gnulib/update-gnulib.sh +++ b/gnulib/update-gnulib.sh @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2011-2019 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This file is part of GDB. # @@ -32,6 +32,7 @@ IMPORTED_GNULIB_MODULES="\ alloca \ canonicalize-lgpl \ + count-one-bits \ dirent \ dirfd \ errno \ @@ -59,6 +60,7 @@ IMPORTED_GNULIB_MODULES="\ strstr \ strtok_r \ sys_stat \ + time_r \ unistd \ unsetenv \ update-copyright \ @@ -67,7 +69,7 @@ IMPORTED_GNULIB_MODULES="\ " # The gnulib commit ID to use for the update. -GNULIB_COMMIT_SHA1="38237baf99386101934cd93278023aa4ae523ec0" +GNULIB_COMMIT_SHA1="e22cd2677a4b7beacbf30b93bb0559f7b89f96ce" # The expected version number for the various auto tools we will # use after the import. @@ -163,17 +165,13 @@ fi # Apply our local patches. apply_patches () { - patch -p3 -f -i "$1" + patch -p2 -f -i "$1" if [ $? -ne 0 ]; then echo "Failed to apply some patches. Aborting." exit 1 fi } -apply_patches "patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch" -apply_patches "patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch" -apply_patches "patches/0003-Fix-glob-c-Coverity-issues.patch" - # Regenerate all necessary files... aclocal && autoconf &&