[PATCH 2/2] Fix source file not found when part of the path does not exist but that a canonicalized path exists.

Pedro Alves palves@redhat.com
Fri Mar 27 19:05:00 GMT 2015


On 03/27/2015 06:52 PM, Antoine Tremblay wrote:
> I forgot to mention if you have a recent debian or ubuntu with perl > 
> 5.6 you will have problems running update-gnulib.sh you need to patch 
> your automake 1.11.1 with the patch at : 
> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=aclocal-function-prototypes.debdiff;att=1;bug=752784
> 
> Actually this patch contains a quilt patchset you need to apply the 
> patch inside this patchset...
> 

in the users/palves/gnulib-update branch I just worked around
it in the update-gnulib.sh script itself:

commit e24f90b0469990f97d0f4ff433bdb8c5567736fe
Author:     Pedro Alves <palves@redhat.com>
AuthorDate: Mon Mar 23 11:56:05 2015 +0000
Commit:     Pedro Alves <palves@redhat.com>
CommitDate: Mon Mar 23 11:56:05 2015 +0000

    Set up to update gnulib d164bf67cc2d471facdd5d3b09f80f3688b3a21b

diff --git a/gdb/gnulib/update-gnulib.sh b/gdb/gnulib/update-gnulib.sh
old mode 100644
new mode 100755
index 5c7238f..91acea4
--- a/gdb/gnulib/update-gnulib.sh
+++ b/gdb/gnulib/update-gnulib.sh
@@ -53,7 +53,7 @@ IMPORTED_GNULIB_MODULES="\
 "

 # The gnulib commit ID to use for the update.
-GNULIB_COMMIT_SHA1="8d5bd1402003bd0153984b138735adf537d960b0"
+GNULIB_COMMIT_SHA1="d164bf67cc2d471facdd5d3b09f80f3688b3a21b"

 # The expected version number for the various auto tools we will
 # use after the import.
@@ -110,7 +110,7 @@ if [ "$ver" != "$AUTOMAKE_VERSION" ]; then
 fi

 # Verify that we have the correct version of aclocal.
-ver=`aclocal --version 2>&1 | head -1 | sed 's/.*) //'`
+ver=`aclocal --version 2>&1 | grep -v "called too early to check prototype" | head -1 | sed 's/.*) //'`
 if [ "$ver" != "$ACLOCAL_VERSION" ]; then
    echo "Error: Wrong aclocal version: $ver. Aborting."
    exit 1





More information about the Gdb-patches mailing list