diff options
| author | brooks <brooks@FreeBSD.org> | 2007-11-29 21:49:08 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2007-11-29 21:49:08 +0000 |
| commit | 03d7b4429720c8fe83c026a53ce6a2bf8d425ee7 (patch) | |
| tree | d6ac50cac4c59e560df564ca77b50dcdb73505d7 | |
| parent | e21400d5a1665756d4dc6788a651de14958b30fe (diff) | |
| download | FreeBSD-src-03d7b4429720c8fe83c026a53ce6a2bf8d425ee7.zip FreeBSD-src-03d7b4429720c8fe83c026a53ce6a2bf8d425ee7.tar.gz | |
To reduce the impact of possible removal of the syscalls required by
libkse in FreeBSD 8.0, do not build or install static versions of libkse
(i.e. libkse*.a) in the default case. Static versions will be built and
installed if libthr is not built or if libkse is the default threading
library.
Discussed on: freebsd-arch
MFC after: 3 days
| -rw-r--r-- | ObsoleteFiles.inc | 6 | ||||
| -rw-r--r-- | lib/libkse/Makefile | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b758135..6ac39ac 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071129: Disabled static versions of libkse by default +.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" +OLD_FILES+=usr/lib/libkse.a +OLD_FILES+=usr/lib/libkse_p.a +OLD_FILES+=usr/lib/libkse_pic.a +.endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071108: Removed very crunch OLDCARD support file diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index 8018ce5..a2b5ae8 100644 --- a/lib/libkse/Makefile +++ b/lib/libkse/Makefile @@ -10,12 +10,15 @@ .include <bsd.own.mk> -.if (${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no") && \ - ${SHLIBDIR} == "/usr/lib" +.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no" +LIB=kse +.if ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif +.else +SHLIB=kse +.endif -LIB=kse SHLIB_MAJOR= 3 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ |
