r6497 - glibc-package/branches/glibc-2.21/debian/patches/hurd-i386
Author: aurel32
Date: 2015-08-28 21:52:37 +0000 (Fri, 28 Aug 2015)
New Revision: 6497
Modified:
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/tg-sysheaders.diff
Log:
unfuzz hurd-i386/tg-sysheaders.diff
Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/tg-sysheaders.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/tg-sysheaders.diff 2015-08-28 21:51:08 UTC (rev 6496)
+++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/tg-sysheaders.diff 2015-08-28 21:52:37 UTC (rev 6497)
@@ -8,15 +8,15 @@
* sysdeps/mach/hurd/configure: Regenerate.
---
- sysdeps/mach/configure | 9 +++++++++
- sysdeps/mach/configure.ac | 9 +++++++++
- sysdeps/mach/hurd/configure | 9 +++++++++
- sysdeps/mach/hurd/configure.ac | 9 +++++++++
+ sysdeps/mach/configure | 9 +++++++++
+ sysdeps/mach/configure.ac | 9 +++++++++
+ sysdeps/mach/hurd/configure | 9 +++++++++
+ sysdeps/mach/hurd/configure.ac | 9 +++++++++
4 files changed, 36 insertions(+)
--- a/sysdeps/mach/configure
+++ b/sysdeps/mach/configure
-@@ -165,6 +165,11 @@ fi
+@@ -165,6 +165,11 @@
config_vars="$config_vars
MIG = $MIG"
@@ -28,7 +28,7 @@
### Sanity checks for Mach header installation
-@@ -553,3 +558,7 @@ if test $hurd_cv_mig_retcode = yes; then
+@@ -553,3 +558,7 @@
$as_echo "#define HAVE_MIG_RETCODE 1" >>confdefs.h
fi
@@ -38,7 +38,7 @@
+fi
--- a/sysdeps/mach/configure.ac
+++ b/sysdeps/mach/configure.ac
-@@ -6,6 +6,11 @@ if test "x$MIG" = xMISSING; then
+@@ -6,6 +6,11 @@
fi
LIBC_CONFIG_VAR([MIG], [$MIG])
@@ -50,7 +50,7 @@
### Sanity checks for Mach header installation
AC_CHECK_HEADER(mach/mach_types.h,,
[AC_MSG_ERROR([cannot find Mach headers])], -)
-@@ -124,3 +129,7 @@ if test $hurd_cv_mig_retcode = yes; then
+@@ -124,3 +129,7 @@
fi])
hurd_MIG_RETCODE
@@ -60,10 +60,10 @@
+fi
--- a/sysdeps/mach/hurd/configure
+++ b/sysdeps/mach/hurd/configure
-@@ -17,6 +17,11 @@ case "$machine" in
- ;;
- esac
+@@ -3,6 +3,11 @@
+ $as_echo "#define NO_HIDDEN 1" >>confdefs.h
+
+if test -n "$sysheaders"; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
@@ -72,7 +72,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Hurd header version" >&5
$as_echo_n "checking Hurd header version... " >&6; }
-@@ -52,3 +57,7 @@ if test "x$libc_cv_hurd_version" != xok;
+@@ -38,3 +43,7 @@
fi
use_ldconfig=yes
@@ -82,9 +82,9 @@
+fi
--- a/sysdeps/mach/hurd/configure.ac
+++ b/sysdeps/mach/hurd/configure.ac
-@@ -17,6 +17,11 @@ case "$machine" in
- ;;
- esac
+@@ -3,6 +3,11 @@
+ dnl We need this setting because of the need for PLT calls in ld.so.
+ AC_DEFINE([NO_HIDDEN])
+if test -n "$sysheaders"; then
+ OLD_CPPFLAGS=$CPPFLAGS
@@ -94,7 +94,7 @@
AC_CACHE_CHECK(Hurd header version, libc_cv_hurd_version, [dnl
AC_TRY_COMPILE(dnl
[#include <hurd/version.h>], [
-@@ -31,3 +36,7 @@ if test "x$libc_cv_hurd_version" != xok;
+@@ -17,3 +22,7 @@
fi
use_ldconfig=yes
Reply to: