d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove options MK_LIBKSE and DEFAULT_THREAD_LIB now that we no longer

Browse Source 
build libkse.  This should fix WITHOUT_LIBTHR builds as a side effect.
This commit is contained in:
Ruslan Ermilov 2008-03-29 17:44:40 +00:00
parent e0fbffe617
commit dbdb679c6f
14 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.inc1
View File

@ -1039,18 +1039,14 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_default_thread_lib} \
lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
${_secure_lib_libssl}
.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no"
_default_thread_lib= lib/${DEFAULT_THREAD_LIB}
.elif ${MK_LIBTHR} != "no"
_default_thread_lib= lib/libthr
.elif ${MK_LIBKSE} != "no"
_default_thread_lib= lib/libkse
.if ${MK_LIBTHR} != "no"
_lib_libthr= lib/libthr
.endif
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib

2
ObsoleteFiles.inc
View File

@ -30,7 +30,6 @@ OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
# 20071201: Removal of XRPU driver
OLD_FILES+=usr/include/sys/xrpuio.h
# 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
@ -39,7 +38,6 @@ OLD_FILES+=usr/lib32/libkse.a
OLD_FILES+=usr/lib32/libkse_p.a
OLD_FILES+=usr/lib32/libkse_pic.a
.endif
.endif
# 20071129: Removed a Solaris compatibility header
OLD_FILES+=usr/include/sys/_elf_solaris.h
# 20071125: Renamed to pmc_get_msr()

2
cddl/lib/Makefile
View File

@ -11,7 +11,7 @@ SUBDIR= libavl \
.if ${MK_ZFS} != "no"
_libzfs= libzfs
.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
.if ${MK_LIBTHR} != "no"
_libzpool= libzpool
.endif
.endif

2
cddl/usr.bin/Makefile
View File

@ -5,7 +5,7 @@
SUBDIR= ${_ztest}
.if ${MK_ZFS} != "no"
.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
.if ${MK_LIBTHR} != "no"
_ztest= ztest
.endif
.endif

2
cddl/usr.sbin/Makefile
View File

@ -5,7 +5,7 @@
SUBDIR= ${_zdb}
.if ${MK_ZFS} != "no"
.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
.if ${MK_LIBTHR} != "no"
_zdb= zdb
.endif
.endif

5
lib/libthr/Makefile
View File

@ -10,8 +10,7 @@
.include <bsd.own.mk>
.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBKSE} == "no") && \
${SHLIBDIR} == "/usr/lib"
.if ${SHLIBDIR} == "/usr/lib"
SHLIBDIR= /lib
.endif
@ -43,7 +42,6 @@ PRECIOUSLIB=
.include "${.CURDIR}/sys/Makefile.inc"
.include "${.CURDIR}/thread/Makefile.inc"
.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBKSE} == "no"
SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
.if !defined(NO_PIC)
SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
@ -51,6 +49,5 @@ SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
.if ${MK_PROFILE} != "no"
SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
.endif
.endif
.include <bsd.lib.mk>

2
sbin/ggate/Makefile
View File

@ -6,7 +6,7 @@ SUBDIR= ${_ggatec} \
${_ggated} \
ggatel
.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
.if ${MK_LIBTHR} != "no"
_ggatec= ggatec
_ggated= ggated
.endif

2
share/man/man3/Makefile
View File

@ -148,7 +148,7 @@ MLINKS+= tree.3 RB_EMPTY.3 \
tree.3 SPLAY_RIGHT.3 \
tree.3 SPLAY_ROOT.3
.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
.if ${MK_LIBTHR} != "no"
PTHREAD_MAN= pthread.3 \
pthread_atfork.3 \
pthread_attr.3 \

6
share/mk/bsd.own.mk
View File

@ -162,8 +162,6 @@ NLSOWN?= ${SHAREOWN}
NLSGRP?= ${SHAREGRP}
NLSMODE?= ${NOBINMODE}
DEFAULT_THREAD_LIB?= libthr
INCLUDEDIR?= /usr/include
# Common variables
@ -328,7 +326,6 @@ WITH_IDEA=
KVM \
LIB32 \
LIBPTHREAD \
LIBKSE \
LIBTHR \
LOCALES \
LPR \
@ -399,11 +396,10 @@ MK_${var}:= no
# Order is somewhat important.
#
.if ${MK_LIBPTHREAD} == "no"
MK_LIBKSE:= no
MK_LIBTHR:= no
.endif
.if ${MK_LIBKSE} == "no" && ${MK_LIBTHR} == "no"
.if ${MK_LIBTHR} == "no"
MK_BIND:= no
.endif

4
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -907,10 +907,6 @@ OLD_FILES+=usr/share/man/man8/ktutil.8.gz
# to be filled in
#.endif
#.if ${MK_LIBKSE} == no
# to be filled in
#.endif
#.if ${MK_LIBTHR} == no
# to be filled in
#.endif

5
tools/build/options/WITHOUT_LIBKSE
View File

@ -1,5 +0,0 @@
.\" $FreeBSD$
Set to not build the
.Nm libkse
(M:N threading)
library.

2
usr.bin/Makefile
View File

@ -263,7 +263,7 @@ _calendar= calendar
.if ${MK_OPENSSL} != "no"
_chkey= chkey
_newkey= newkey
.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
.if ${MK_LIBTHR} != "no"
_csup= csup
.endif
.endif

4
usr.sbin/Makefile
View File

@ -270,7 +270,7 @@ _ypset= ypset
_authpf= authpf
.endif
.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
.if ${MK_LIBTHR} != "no"
_pppctl= pppctl
.endif
@ -279,7 +279,7 @@ _lpr= lpr
.endif
.if ${MK_NS_CACHING} != "no"
.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
.if ${MK_LIBTHR} != "no"
_nscd= nscd
.endif
.endif

2
usr.sbin/ngctl/Makefile
View File

@ -13,7 +13,7 @@ WARNS?= 3
NGCTL_NO_LIBEDIT=
.endif
.if ${MK_LIBTHR} == "no" && ${MK_LIBKSE} == "no"
.if ${MK_LIBTHR} == "no"
NGCTL_NO_LIBEDIT=
.endif