3889. [port] hurd: configure fixes as per:

                        https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746540

(cherry picked from commit 89119e3cafff373426858f6cec7c09539f53e209)

diff --git a/CHANGES b/CHANGES
index 02f4385b654cdc8616fea7697ef2e39665ef88ea..1851b9cb34c41f957dd36746b921c14969370c48 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3889.  [port]          hurd: configure fixes as per:
+                       https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746540
+
 3887.  [cleanup]       Make all static symbols in rbtdb64 end in "64" so
                        they are easier to use in a debugger. [RT #36373]
 

diff --git a/configure b/configure
index aebaf3507c86d880200d920f117cecf2b8a050ee..b8a87f32ba9dd101d9d872040f84535f61669361 100755 (executable)
--- a/configure
+++ b/configure
@@ -12591,7 +12591,7 @@ case "$host" in
        # as it breaks how the two halves (Basic and Advanced) of the IPv6
        # Socket API were designed to be used but we have to live with it.
        # Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
-       *-linux* | *-kfreebsd*-gnu)
+       *-linux* | *-kfreebsd*-gnu*)
                STD_CDEFINES="$STD_CDEFINES -D_GNU_SOURCE"
                CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
                ;;
@@ -20383,7 +20383,7 @@ if test -f "${srcdir}/srcid"; then
        . "${srcdir}/srcid"
        BIND9_SRCID="SRCID=$SRCID"
 elif test -d "${srcdir}/.git"; then
-       BIND9_SRCID="SRCID="`(cd "${srcdir}";git log -n 1 --format=%h)`
+       BIND9_SRCID="SRCID="`(cd "${srcdir}";git rev-parse --short HEAD)`
 fi
 
 
@@ -20534,7 +20534,7 @@ fi
 
 if test "$dlopen" = "yes"; then
        case $host in
-               *-linux*)
+               *-linux*|*-gnu*)
                        SO_CFLAGS="-fPIC"
                        SO_LDFLAGS=""
                        if test "$have_dl" = "yes"

diff --git a/configure.in b/configure.in
index fbd33957daf6b8c05733f2e752089c47a1d89ca8..31b9f57fe81adb9b05858276e0c9051cc92bff4a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -420,7 +420,7 @@ case "$host" in
        # as it breaks how the two halves (Basic and Advanced) of the IPv6
        # Socket API were designed to be used but we have to live with it.
        # Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
-       *-linux* | *-kfreebsd*-gnu)
+       *-linux* | *-kfreebsd*-gnu*)
                STD_CDEFINES="$STD_CDEFINES -D_GNU_SOURCE"
                CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
                ;;
@@ -4176,7 +4176,7 @@ fi
 
 if test "$dlopen" = "yes"; then
        case $host in
-               *-linux*)
+               *-linux*|*-gnu*)
                        SO_CFLAGS="-fPIC"
                        SO_LDFLAGS=""
                        if test "$have_dl" = "yes"