X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gnulib%2Fupdate-gnulib.sh;h=602a21d6dbfd0c530973f8cd74a5fbce857c9dec;hb=c0c3707ff46ccfb78ea175dd42d628d8c90dca8b;hp=f8d68fca893038cc407cafb620378ef7f80f202c;hpb=f81e7e2db6d1aaf47561e54356aee12b585533c2;p=deliverable%2Fbinutils-gdb.git diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh index f8d68fca89..602a21d6db 100755 --- a/gnulib/update-gnulib.sh +++ b/gnulib/update-gnulib.sh @@ -68,7 +68,7 @@ IMPORTED_GNULIB_MODULES="\ " # The gnulib commit ID to use for the update. -GNULIB_COMMIT_SHA1="38237baf99386101934cd93278023aa4ae523ec0" +GNULIB_COMMIT_SHA1="6be2862414da45975b8cbc33acc5387b012f3354" # The expected version number for the various auto tools we will # use after the import. @@ -164,17 +164,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 &&