* 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:
Roland McGrath 2005-07-03 04:40:53 +00:00
parent 88e3fbcb5d
commit b3af1a245b
6 changed files with 30 additions and 40 deletions

View File

@ -1,3 +1,17 @@
2005-07-02 Roland McGrath <roland@redhat.com>
* 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).
2005-06-27 Jakub Jelinek <jj@ultra.linux.cz>
[BZ #1037]

View File

@ -14,15 +14,7 @@ installation. It is updated more frequently than this manual.
Features can be added to GNU Libc via @dfn{add-on} bundles. These are
separate tar files, which you unpack into the top level of the source
tree. Then you give @code{configure} the @samp{--enable-add-ons} option
to activate them, and they will be compiled into the library. As of the
2.2 release, one important component of glibc is distributed as
``official'' add-ons: the linuxthreads add-on. Unless you are doing an
unusual installation, you should get this.
Support for POSIX threads is maintained by someone else, so it's in a
separate package. It is only available for GNU/Linux systems, but this will
change in the future. Get it from the same place you got the main
bundle; the file is @file{glibc-linuxthreads-@var{VERSION}.tar.gz}.
to activate them, and they will be compiled into the library.
You will need recent versions of several GNU tools: definitely GCC and
GNU Make, and possibly others. @xref{Tools for Compilation}, below.
@ -107,7 +99,7 @@ Enable add-on packages in your source tree. If this option is specified
with no list, it enables all the add-on packages it finds. If you do
not wish to use some add-on packages that you have present in your source
tree, give this option a list of the add-ons that you @emph{do} want
used, like this: @samp{--enable-add-ons=linuxthreads}
used, like this: @samp{--enable-add-ons=nptl}
@item --enable-kernel=@var{version}
This option is currently only useful on GNU/Linux systems. The

View File

@ -1 +1,2 @@
linuxthreads
nptl

View File

@ -1 +1,2 @@
linuxthreads
nptl

View File

@ -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

View File

@ -196,38 +196,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