qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Manolis Ragkousis 2015-08-26 23:48:33 +02:00 committed by Samuel Thibault
parent bd9e69abb8
commit ccdc039c9d
5 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2015-09-06 Manolis Ragkousis <manolis837@gmail.com>
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.
2015-09-04 Roland McGrath <roland@hack.frob.com> 2015-09-04 Roland McGrath <roland@hack.frob.com>
[BZ #18921] [BZ #18921]

9
sysdeps/mach/configure vendored
View File

@ -165,6 +165,11 @@ fi
config_vars="$config_vars config_vars="$config_vars
MIG = $MIG" MIG = $MIG"
if test -n "$sysheaders"; then
OLD_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
fi
### Sanity checks for Mach header installation ### 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 $as_echo "#define HAVE_MIG_RETCODE 1" >>confdefs.h
fi fi
if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi

9
sysdeps/mach/configure.ac
View File

@ -6,6 +6,11 @@ if test "x$MIG" = xMISSING; then
fi fi
LIBC_CONFIG_VAR([MIG], [$MIG]) LIBC_CONFIG_VAR([MIG], [$MIG])
if test -n "$sysheaders"; then
OLD_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
fi
### Sanity checks for Mach header installation ### Sanity checks for Mach header installation
AC_CHECK_HEADER(mach/mach_types.h,, AC_CHECK_HEADER(mach/mach_types.h,,
[AC_MSG_ERROR([cannot find Mach headers])], -) [AC_MSG_ERROR([cannot find Mach headers])], -)
@ -124,3 +129,7 @@ if test $hurd_cv_mig_retcode = yes; then
fi]) fi])
hurd_MIG_RETCODE hurd_MIG_RETCODE
if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi

9
sysdeps/mach/hurd/configure vendored
View File

@ -3,6 +3,11 @@
$as_echo "#define NO_HIDDEN 1" >>confdefs.h $as_echo "#define NO_HIDDEN 1" >>confdefs.h
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 "$as_me:${as_lineno-$LINENO}: checking Hurd header version" >&5
$as_echo_n "checking Hurd header version... " >&6; } $as_echo_n "checking Hurd header version... " >&6; }
@ -36,3 +41,7 @@ $as_echo "$libc_cv_hurd_version" >&6; }
if test "x$libc_cv_hurd_version" != xok; then if test "x$libc_cv_hurd_version" != xok; then
as_fn_error $? "Hurd headers not installed or too old" "$LINENO" 5 as_fn_error $? "Hurd headers not installed or too old" "$LINENO" 5
fi fi
if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi

9
sysdeps/mach/hurd/configure.ac
View File

@ -3,6 +3,11 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
dnl We need this setting because of the need for PLT calls in ld.so. dnl We need this setting because of the need for PLT calls in ld.so.
AC_DEFINE([NO_HIDDEN]) AC_DEFINE([NO_HIDDEN])
if test -n "$sysheaders"; then
OLD_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
fi
AC_CACHE_CHECK(Hurd header version, libc_cv_hurd_version, [dnl AC_CACHE_CHECK(Hurd header version, libc_cv_hurd_version, [dnl
AC_TRY_COMPILE(dnl AC_TRY_COMPILE(dnl
[#include <hurd/version.h>], [ [#include <hurd/version.h>], [
@ -15,3 +20,7 @@ AC_TRY_COMPILE(dnl
if test "x$libc_cv_hurd_version" != xok; then if test "x$libc_cv_hurd_version" != xok; then
AC_MSG_ERROR(Hurd headers not installed or too old) AC_MSG_ERROR(Hurd headers not installed or too old)
fi fi
if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi