Author: ru
Date: Mon Feb 15 14:14:13 2010
New Revision: 203918
URL: http://svn.freebsd.org/changeset/base/203918
Log:
Though these libraries are disconnected from the build and don't
currently build, they should be kept. [1]
Unbreak their makefiles by removing the support for the long gone
DEFAULT_THREAD_LIB knob. (Allows the tools/make_libdeps.sh script
to succeed.)
According to: davidxu and deischen [1]
MFC after: 3 days
Modified:
head/lib/libc_r/Makefile
head/lib/libkse/Makefile
Modified: head/lib/libc_r/Makefile
==============================================================================
--- head/lib/libc_r/Makefile Mon Feb 15 14:08:06 2010 (r203917)
+++ head/lib/libc_r/Makefile Mon Feb 15 14:14:13 2010 (r203918)
@@ -10,10 +10,6 @@
.include <bsd.own.mk>
-.if ${DEFAULT_THREAD_LIB} == "libc_r" && ${SHLIBDIR} == "/usr/lib"
-SHLIBDIR= /lib
-.endif
-
LIB=c_r
SHLIB_MAJOR= 7
CFLAGS+=-DPTHREAD_KERNEL
@@ -32,16 +28,4 @@ PRECIOUSLIB=
.include "${.CURDIR}/uthread/Makefile.inc"
.include "${.CURDIR}/sys/Makefile.inc"
-.if ${DEFAULT_THREAD_LIB} == "libc_r"
-.if ${MK_INSTALLLIB} != "no"
-SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
-.endif
-.if !defined(NO_PIC)
-SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
-.endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
-.endif
-.endif
-
.include <bsd.lib.mk>
Modified: head/lib/libkse/Makefile
==============================================================================
--- head/lib/libkse/Makefile Mon Feb 15 14:08:06 2010 (r203917)
+++ head/lib/libkse/Makefile Mon Feb 15 14:14:13 2010 (r203918)
@@ -10,15 +10,7 @@
.include <bsd.own.mk>
-.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no"
-LIB=kse
-.if ${SHLIBDIR} == "/usr/lib"
-SHLIBDIR= /lib
-.endif
-.else
SHLIB=kse
-.endif
-
SHLIB_MAJOR= 4
CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
@@ -51,16 +43,4 @@ PRECIOUSLIB=
.include "${.CURDIR}/sys/Makefile.inc"
.include "${.CURDIR}/thread/Makefile.inc"
-.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no"
-.if ${MK_INSTALLLIB} != "no"
-SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
-.endif
-.if !defined(NO_PIC)
-SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
-.endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
-.endif
-.endif
-
.include <bsd.lib.mk>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
