From a04f2acdec9a2c0a1ce79789557d0fbe610eae42 Mon Sep 17 00:00:00 2001 From: Josef Karthauser Date: Tue, 2 May 2000 14:16:19 +0000 Subject: [PATCH] Disconnect libm from the build tree. It's broken, not being maintained, and has been replaced by msun. The libm sources shouldn't be removed just yet as there are parts that should be merged into msun first. PR: misc/17848 Discussed with: phk & bde --- etc/defaults/make.conf | 4 ---- lib/Makefile | 10 ++-------- lib/libm/README-FREEBSD | 7 +++++++ share/examples/etc/make.conf | 4 ---- 4 files changed, 9 insertions(+), 16 deletions(-) create mode 100644 lib/libm/README-FREEBSD diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 055a41018c3..85b3c0cd908 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -76,10 +76,6 @@ # #COPTFLAGS= -O -pipe # -# To compile and install the 4.4 lite libm instead of the default use: -# -#WANT_CSRG_LIBM= yes -# # If you do not want unformatted manual pages to be compressed # when they are installed: # diff --git a/lib/Makefile b/lib/Makefile index b934bba834a..82b4ea47d26 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -7,7 +7,7 @@ # csu must be built before all shared libaries for ELF. # libcom_err must be built before libkrb, libpam and libss. # libcrypt must be built before libkrb, libpam and libskey. -# libm must be built before libg++ and libstdc++. +# msun must be built before libg++ and libstdc++. # libmd must be built before libatm, libopie, libradius, libskey, and # libtacplus. # libncurses must be built before libdialog, libedit and libreadline. @@ -19,7 +19,7 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR= ${_csu} libcom_err ${_libcrypt} ${_libm} libmd \ +SUBDIR= ${_csu} libcom_err ${_libcrypt} msun libmd \ libncurses libradius libskey libtacplus libutil \ ${_compat} libalias libatm ${_libbind} libc ${_libc_r} libcalendar \ libcam libcompat libdevstat libdisk libedit libfetch libform \ @@ -56,12 +56,6 @@ _libncp= libncp _libvgl= libvgl .endif -.if defined(WANT_CSRG_LIBM) -_libm= libm -.else -_libm= msun -.endif - .if ${MACHINE_ARCH} == "alpha" _libio= libio .endif diff --git a/lib/libm/README-FREEBSD b/lib/libm/README-FREEBSD new file mode 100644 index 00000000000..d7ad931ca1b --- /dev/null +++ b/lib/libm/README-FREEBSD @@ -0,0 +1,7 @@ +$FreeBSD$ + +The libm library has been superceded by the msun library. The +source has not been delegated to the attic yet because there are +still bits that need to be merged into msun. + +(end) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 055a41018c3..85b3c0cd908 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -76,10 +76,6 @@ # #COPTFLAGS= -O -pipe # -# To compile and install the 4.4 lite libm instead of the default use: -# -#WANT_CSRG_LIBM= yes -# # If you do not want unformatted manual pages to be compressed # when they are installed: #