r6482 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2015-08-26 21:54:54 +0000 (Wed, 26 Aug 2015)
New Revision: 6482
Added:
glibc-package/trunk/debian/patches/hurd-i386/tg-sysheaders.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
New patch to fix stage1 finding hurd headers
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2015-08-23 19:31:01 UTC (rev 6481)
+++ glibc-package/trunk/debian/changelog 2015-08-26 21:54:54 UTC (rev 6482)
@@ -4,6 +4,8 @@
mapping of BARs above 2GiB. Closes: #793543.
* rules.d/build.mk: Also install crt0.o in stage1, if any.
* sysdeps/hurd-i386.mk: Fix stage1 about xen packages for hurd-i386 too.
+ * patches/hurd-i386/tg-sysheaders.diff: New patch to fix stage1 finding hurd
+ headers.
-- Samuel Thibault <sthibault@debian.org> Sun, 09 Aug 2015 20:00:16 +0000
Added: glibc-package/trunk/debian/patches/hurd-i386/tg-sysheaders.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/tg-sysheaders.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/tg-sysheaders.diff 2015-08-26 21:54:54 UTC (rev 6482)
@@ -0,0 +1,104 @@
+From: Manolis Ragkousis <manolis837@gmail.com>
+Date: Fri, 14 Aug 2015 01:20:59 +0300
+Subject: [PATCH] Check sysheaders when looking for Mach and Hurd headers.
+
+* sysdeps/mach/configure.ac: Add sysheaders check.
+* sysdeps/mach/configure: Regenerate.
+* sysdeps/mach/hurd/configure.ac: Add sysheaders check.
+* 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 +++++++++
+ 4 files changed, 36 insertions(+)
+
+--- a/sysdeps/mach/configure
++++ b/sysdeps/mach/configure
+@@ -165,6 +165,11 @@ fi
+ config_vars="$config_vars
+ MIG = $MIG"
+
++if test -n "$sysheaders"; then
++ OLD_CPPFLAGS=$CPPFLAGS
++ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
++fi
++
+ ### Sanity checks for Mach header installation
+
+
+@@ -553,3 +558,7 @@ if test $hurd_cv_mig_retcode = yes; then
+ $as_echo "#define HAVE_MIG_RETCODE 1" >>confdefs.h
+
+ fi
++
++if test -n "$sysheaders"; then
++ CPPFLAGS=$OLD_CPPFLAGS
++fi
+--- a/sysdeps/mach/configure.ac
++++ b/sysdeps/mach/configure.ac
+@@ -6,6 +6,11 @@ if test "x$MIG" = xMISSING; then
+ fi
+ LIBC_CONFIG_VAR([MIG], [$MIG])
+
++if test -n "$sysheaders"; then
++ OLD_CPPFLAGS=$CPPFLAGS
++ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
++fi
++
+ ### 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
+ fi])
+
+ hurd_MIG_RETCODE
++
++if test -n "$sysheaders"; then
++ CPPFLAGS=$OLD_CPPFLAGS
++fi
+--- a/sysdeps/mach/hurd/configure
++++ b/sysdeps/mach/hurd/configure
+@@ -17,6 +17,11 @@ case "$machine" in
+ ;;
+ esac
+
++if test -n "$sysheaders"; then
++ OLD_CPPFLAGS=$CPPFLAGS
++ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
++fi
++
+
+ { $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;
+ fi
+
+ use_ldconfig=yes
++
++if test -n "$sysheaders"; then
++ CPPFLAGS=$OLD_CPPFLAGS
++fi
+--- a/sysdeps/mach/hurd/configure.ac
++++ b/sysdeps/mach/hurd/configure.ac
+@@ -17,6 +17,11 @@ case "$machine" in
+ ;;
+ esac
+
++if test -n "$sysheaders"; then
++ OLD_CPPFLAGS=$CPPFLAGS
++ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
++fi
++
+ 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;
+ fi
+
+ use_ldconfig=yes
++
++if test -n "$sysheaders"; then
++ CPPFLAGS=$OLD_CPPFLAGS
++fi
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2015-08-23 19:31:01 UTC (rev 6481)
+++ glibc-package/trunk/debian/patches/series 2015-08-26 21:54:54 UTC (rev 6482)
@@ -160,6 +160,7 @@
hurd-i386/cvs-libpthread-libc-lockP2.diff
hurd-i386/cvs-mlock.diff
hurd-i386/tg-mmap32th_bit.diff
+hurd-i386/tg-sysheaders.diff
i386/local-biarch.diff
i386/local-cmov.diff
Reply to: