mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
* manual/install.texi (Installation): Don't mention linuxthreads.
(Configuring and compiling): Don't use linuxthreads as example. * sysdeps/unix/sysv/linux/configure.in: Check for nptl add-on only, not linuxthreads. * sysdeps/unix/sysv/linux/configure: Regenerated. * resolv/Depend: Add nptl. * rt/Depend: Likewise. * linuxthreads, linuxthreads_db: Directories removed (preserved in ports repository).
This commit is contained in:
21
sysdeps/unix/sysv/linux/configure
vendored
21
sysdeps/unix/sysv/linux/configure
vendored
@ -261,38 +261,29 @@ case "$prefix" in
|
||||
;;
|
||||
esac
|
||||
|
||||
# Under Linux the LinuxThreads or NPTL add-on should be available.
|
||||
# Under Linux the NPTL add-on should be available.
|
||||
case $add_ons in
|
||||
# Only one of the add-ons should be available.
|
||||
*linuxthreads*nptl*|*nptl*linuxthreads*)
|
||||
echo "\
|
||||
*** LinuxThreads and NPTL add-ons are both available. Only one must be used."
|
||||
exit 1
|
||||
;;
|
||||
# It is available. Good.
|
||||
*linuxthreads*)
|
||||
linuxthreads_missing=
|
||||
;;
|
||||
*nptl*)
|
||||
linuxthreads_missing=
|
||||
nptl_missing=
|
||||
;;
|
||||
*)
|
||||
linuxthreads_missing=yes
|
||||
nptl_missing=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "$linuxthreads_missing"; then
|
||||
if test "$nptl_missing"; then
|
||||
if test $enable_sanity = yes; then
|
||||
echo "\
|
||||
*** On GNU/Linux systems it is normal to compile GNU libc with the
|
||||
*** \`linuxthreads' add-on. Without that, the library will be
|
||||
*** \`nptl' add-on. Without that, the library will be
|
||||
*** incompatible with normal GNU/Linux systems.
|
||||
*** If you really mean to not use this add-on, run configure again
|
||||
*** using the extra parameter \`--disable-sanity-checks'."
|
||||
exit 1
|
||||
else
|
||||
echo "\
|
||||
*** WARNING: Are you sure you do not want to use the \`linuxthreads'
|
||||
*** WARNING: Are you sure you do not want to use the \`nptl'
|
||||
*** add-on?"
|
||||
fi
|
||||
fi
|
||||
|
Reference in New Issue
Block a user