mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
Hurd: Support --prefix=/usr special-casing for all GNU systems.
This commit is contained in:
Thomas Schwinge
Roland McGrath
parent
8e41b99fe1
commit
674cdbc7a3
@ -1,5 +1,13 @@
|
||||
2012-05-10 Thomas Schwinge <thomas@schwinge.name>
|
||||
|
||||
* sysdeps/mach/hurd/configure.in: Remove warning for --prefix=[...].
|
||||
* sysdeps/mach/hurd/configure: Regenerated.
|
||||
* sysdeps/unix/sysv/linux/configure.in: Move --prefix=/usr
|
||||
special-casing to...
|
||||
* sysdeps/gnu/configure.in: ... this new file.
|
||||
* sysdeps/unix/sysv/linux/configure: Regenerated.
|
||||
* sysdeps/gnu/configure: New generated file.
|
||||
|
||||
* sysdeps/mach/hurd/bits/stat.h (struct stat): Align to what is done
|
||||
for Linux: use nsec instead of usec, as well as:
|
||||
[__USE_MISC || __USE_XOPEN2K8] (st_atim, st_mtim, st_ctim): New
|
||||
|
||||
36
sysdeps/gnu/configure
vendored
Normal file
36
sysdeps/gnu/configure
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
|
||||
|
||||
# Local configure fragment for sysdeps/gnu.
|
||||
|
||||
# The Filesystem Hierarchy Standard prescribes where to place "essential"
|
||||
# files. I.e., when the installation prefix is "/usr" we have to place
|
||||
# shared library objects and the configuration files on the root partition
|
||||
# in /lib and /etc.
|
||||
case "$prefix" in
|
||||
/usr | /usr/)
|
||||
# 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
|
||||
# Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
|
||||
# and libc_cv_localedir.
|
||||
test -n "$libc_cv_slibdir" || \
|
||||
case $machine in
|
||||
sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
|
||||
libc_cv_slibdir=/lib64
|
||||
if test "$libdir" = '${exec_prefix}/lib'; then
|
||||
libdir='${exec_prefix}/lib64';
|
||||
# Locale data can be shared between 32bit and 64bit libraries
|
||||
libc_cv_localedir='${exec_prefix}/lib/locale'
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
libc_cv_slibdir=/lib
|
||||
;;
|
||||
esac
|
||||
# Allow the user to override the path with --sysconfdir
|
||||
if test "$sysconfdir" = '${prefix}/etc'; then
|
||||
libc_cv_sysconfdir=/etc
|
||||
else
|
||||
libc_cv_sysconfdir=$sysconfdir
|
||||
fi
|
||||
libc_cv_rootsbindir=/sbin
|
||||
;;
|
||||
esac
|
||||
36
sysdeps/gnu/configure.in
Normal file
36
sysdeps/gnu/configure.in
Normal file
@ -0,0 +1,36 @@
|
||||
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
|
||||
|
||||
# Local configure fragment for sysdeps/gnu.
|
||||
|
||||
# The Filesystem Hierarchy Standard prescribes where to place "essential"
|
||||
# files. I.e., when the installation prefix is "/usr" we have to place
|
||||
# shared library objects and the configuration files on the root partition
|
||||
# in /lib and /etc.
|
||||
case "$prefix" in
|
||||
/usr | /usr/)
|
||||
# 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
|
||||
# Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
|
||||
# and libc_cv_localedir.
|
||||
test -n "$libc_cv_slibdir" || \
|
||||
case $machine in
|
||||
sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
|
||||
libc_cv_slibdir=/lib64
|
||||
if test "$libdir" = '${exec_prefix}/lib'; then
|
||||
libdir='${exec_prefix}/lib64';
|
||||
# Locale data can be shared between 32bit and 64bit libraries
|
||||
libc_cv_localedir='${exec_prefix}/lib/locale'
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
libc_cv_slibdir=/lib
|
||||
;;
|
||||
esac
|
||||
# Allow the user to override the path with --sysconfdir
|
||||
if test "$sysconfdir" = '${prefix}/etc'; then
|
||||
libc_cv_sysconfdir=/etc
|
||||
else
|
||||
libc_cv_sysconfdir=$sysconfdir
|
||||
fi
|
||||
libc_cv_rootsbindir=/sbin
|
||||
;;
|
||||
esac
|
||||
170
sysdeps/mach/hurd/configure
vendored
170
sysdeps/mach/hurd/configure
vendored
@ -1,22 +1,135 @@
|
||||
|
||||
# as_fn_set_status STATUS
|
||||
# -----------------------
|
||||
# Set $? to STATUS, without forking.
|
||||
as_fn_set_status ()
|
||||
{
|
||||
return $1
|
||||
} # as_fn_set_status
|
||||
|
||||
# as_fn_exit STATUS
|
||||
# -----------------
|
||||
# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
||||
as_fn_exit ()
|
||||
{
|
||||
set +e
|
||||
as_fn_set_status $1
|
||||
exit $1
|
||||
} # as_fn_exit
|
||||
if expr a : '\(a\)' >/dev/null 2>&1 &&
|
||||
test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
||||
as_expr=expr
|
||||
else
|
||||
as_expr=false
|
||||
fi
|
||||
|
||||
if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
||||
as_basename=basename
|
||||
else
|
||||
as_basename=false
|
||||
fi
|
||||
|
||||
as_me=`$as_basename -- "$0" ||
|
||||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
||||
X"$0" : 'X\(//\)$' \| \
|
||||
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
||||
$as_echo X/"$0" |
|
||||
sed '/^.*\/\([^/][^/]*\)\/*$/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
/^X\/\(\/\/\)$/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
/^X\/\(\/\).*/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
s/.*/./; q'`
|
||||
|
||||
|
||||
as_lineno_1=$LINENO as_lineno_1a=$LINENO
|
||||
as_lineno_2=$LINENO as_lineno_2a=$LINENO
|
||||
eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
|
||||
test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
|
||||
# Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
|
||||
sed -n '
|
||||
p
|
||||
/[$]LINENO/=
|
||||
' <$as_myself |
|
||||
sed '
|
||||
s/[$]LINENO.*/&-/
|
||||
t lineno
|
||||
b
|
||||
:lineno
|
||||
N
|
||||
:loop
|
||||
s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
||||
t loop
|
||||
s/-\n.*//
|
||||
' >$as_me.lineno &&
|
||||
chmod +x "$as_me.lineno" ||
|
||||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
||||
|
||||
# Don't try to exec as it changes $[0], causing all sort of problems
|
||||
# (the dirname of $[0] is not the place where we might find the
|
||||
# original and so on. Autoconf is especially sensitive to this).
|
||||
. "./$as_me.lineno"
|
||||
# Exit status is that of the last command.
|
||||
exit
|
||||
}
|
||||
|
||||
|
||||
# ac_fn_c_try_compile LINENO
|
||||
# --------------------------
|
||||
# Try to compile conftest.$ac_ext, and return whether this succeeded.
|
||||
ac_fn_c_try_compile ()
|
||||
{
|
||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||
rm -f conftest.$ac_objext
|
||||
if { { ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo"; } >&5
|
||||
(eval "$ac_compile") 2>conftest.err
|
||||
ac_status=$?
|
||||
if test -s conftest.err; then
|
||||
grep -v '^ *+' conftest.err >conftest.er1
|
||||
cat conftest.er1 >&5
|
||||
mv -f conftest.er1 conftest.err
|
||||
fi
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then :
|
||||
ac_retval=0
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_retval=1
|
||||
fi
|
||||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||||
as_fn_set_status $ac_retval
|
||||
|
||||
} # ac_fn_c_try_compile
|
||||
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
|
||||
|
||||
# GNU libc on the Hurd is always reentrant.
|
||||
DEFINES="$DEFINES -D_LIBC_REENTRANT"
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define NO_HIDDEN 1
|
||||
_ACEOF
|
||||
$as_echo "#define NO_HIDDEN 1" >>confdefs.h
|
||||
|
||||
|
||||
# Don't bother trying to generate any glue code to be compatible with the
|
||||
# existing system library, because we are the only system library.
|
||||
inhibit_glue=yes
|
||||
|
||||
if test "x$prefix" != x; then
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: --prefix= (empty) is required for GNU/Hurd to work normally" >&5
|
||||
$as_echo "$as_me: WARNING: --prefix= (empty) is required for GNU/Hurd to work normally" >&2;}
|
||||
fi
|
||||
|
||||
case "$machine" in
|
||||
i386*)
|
||||
# The default oldest ABI is 2.2.6.
|
||||
@ -28,16 +141,12 @@ case "$machine" in
|
||||
esac
|
||||
|
||||
|
||||
{ $as_echo "$as_me:$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; }
|
||||
if test "${libc_cv_hurd_version+set}" = set; then
|
||||
if ${libc_cv_hurd_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <hurd/version.h>
|
||||
int
|
||||
@ -52,38 +161,15 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
libc_cv_hurd_version=ok
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
libc_cv_hurd_version=bad
|
||||
libc_cv_hurd_version=bad
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $libc_cv_hurd_version" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_hurd_version" >&5
|
||||
$as_echo "$libc_cv_hurd_version" >&6; }
|
||||
if test "x$libc_cv_hurd_version" != xok; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: Hurd headers not installed or too old" >&5
|
||||
$as_echo "$as_me: error: Hurd headers not installed or too old" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
as_fn_error $? "Hurd headers not installed or too old" "$LINENO" 5
|
||||
fi
|
||||
|
||||
@ -10,10 +10,6 @@ AC_DEFINE([NO_HIDDEN])
|
||||
# existing system library, because we are the only system library.
|
||||
inhibit_glue=yes
|
||||
|
||||
if test "x$prefix" != x; then
|
||||
AC_MSG_WARN([--prefix= (empty) is required for GNU/Hurd to work normally])
|
||||
fi
|
||||
|
||||
case "$machine" in
|
||||
i386*)
|
||||
# The default oldest ABI is 2.2.6.
|
||||
|
||||
32
sysdeps/unix/sysv/linux/configure
vendored
32
sysdeps/unix/sysv/linux/configure
vendored
@ -382,38 +382,6 @@ fi
|
||||
if test -n "$sysheaders"; then
|
||||
CPPFLAGS=$OLD_CPPFLAGS
|
||||
fi
|
||||
# The Linux filesystem standard prescribes where to place "essential"
|
||||
# files. I.e., when the installation prefix is "/usr" we have to place
|
||||
# shared library objects and the configuration files on the root partition
|
||||
# in /lib and /etc.
|
||||
case "$prefix" in
|
||||
/usr | /usr/)
|
||||
# 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
|
||||
# Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
|
||||
# and libc_cv_localedir.
|
||||
test -n "$libc_cv_slibdir" || \
|
||||
case $machine in
|
||||
sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
|
||||
libc_cv_slibdir="/lib64"
|
||||
if test "$libdir" = '${exec_prefix}/lib'; then
|
||||
libdir='${exec_prefix}/lib64';
|
||||
# Locale data can be shared between 32bit and 64bit libraries
|
||||
libc_cv_localedir='${exec_prefix}/lib/locale'
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
libc_cv_slibdir="/lib"
|
||||
;;
|
||||
esac
|
||||
# Allow the user to override the path with --sysconfdir
|
||||
if test $sysconfdir = '${prefix}/etc'; then
|
||||
libc_cv_sysconfdir=/etc
|
||||
else
|
||||
libc_cv_sysconfdir=$sysconfdir
|
||||
fi
|
||||
libc_cv_rootsbindir="/sbin"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Under Linux the NPTL add-on should be available.
|
||||
case $add_ons in
|
||||
|
||||
@ -121,38 +121,6 @@ fi
|
||||
if test -n "$sysheaders"; then
|
||||
CPPFLAGS=$OLD_CPPFLAGS
|
||||
fi
|
||||
# The Linux filesystem standard prescribes where to place "essential"
|
||||
# files. I.e., when the installation prefix is "/usr" we have to place
|
||||
# shared library objects and the configuration files on the root partition
|
||||
# in /lib and /etc.
|
||||
case "$prefix" in
|
||||
/usr | /usr/)
|
||||
# 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
|
||||
# Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
|
||||
# and libc_cv_localedir.
|
||||
test -n "$libc_cv_slibdir" || \
|
||||
case $machine in
|
||||
sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
|
||||
libc_cv_slibdir="/lib64"
|
||||
if test "$libdir" = '${exec_prefix}/lib'; then
|
||||
libdir='${exec_prefix}/lib64';
|
||||
# Locale data can be shared between 32bit and 64bit libraries
|
||||
libc_cv_localedir='${exec_prefix}/lib/locale'
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
libc_cv_slibdir="/lib"
|
||||
;;
|
||||
esac
|
||||
# Allow the user to override the path with --sysconfdir
|
||||
if test $sysconfdir = '${prefix}/etc'; then
|
||||
libc_cv_sysconfdir=/etc
|
||||
else
|
||||
libc_cv_sysconfdir=$sysconfdir
|
||||
fi
|
||||
libc_cv_rootsbindir="/sbin"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Under Linux the NPTL add-on should be available.
|
||||
case $add_ons in
|
||||
|
||||
Loading…
Reference in New Issue
Block a user