summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.inc110
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--cddl/lib/Makefile2
-rw-r--r--cddl/usr.bin/Makefile2
-rw-r--r--cddl/usr.sbin/Makefile2
-rw-r--r--lib/libthr/Makefile5
-rw-r--r--sbin/ggate/Makefile2
-rw-r--r--share/man/man3/Makefile2
-rw-r--r--share/mk/bsd.own.mk6
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc4
-rw-r--r--tools/build/options/WITHOUT_LIBKSE5
-rw-r--r--usr.bin/Makefile2
-rw-r--r--usr.sbin/Makefile4
-rw-r--r--usr.sbin/ngctl/Makefile2
14 files changed, 14 insertions, 36 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 86fe56d860a7..d742d89d4d0d 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index a1533fc5d64a..0e15ff439821 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -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()
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 522dda7331f4..33e28876fb8d 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -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
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 439a2c9c7818..b1fcb8eb194a 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -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
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 913e2ae35b7b..5d1cea38ade9 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -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
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 6e6096070062..cc707a0a606d 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -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>
diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile
index 38ca2f2d0979..8f889f1837eb 100644
--- a/sbin/ggate/Makefile
+++ b/sbin/ggate/Makefile
@@ -6,7 +6,7 @@ SUBDIR= ${_ggatec} \
${_ggated} \
ggatel
-.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+.if ${MK_LIBTHR} != "no"
_ggatec= ggatec
_ggated= ggated
.endif
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index a4de4950a306..b673945d75b1 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -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 \
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 2517cb853e1d..0c944b183c8d 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -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
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 331277b50830..3c42819528e8 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -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
diff --git a/tools/build/options/WITHOUT_LIBKSE b/tools/build/options/WITHOUT_LIBKSE
deleted file mode 100644
index 08d071a89835..000000000000
--- a/tools/build/options/WITHOUT_LIBKSE
+++ /dev/null
@@ -1,5 +0,0 @@
-.\" $FreeBSD$
-Set to not build the
-.Nm libkse
-(M:N threading)
-library.
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 170e5800b25a..e43d055db867 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -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
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 36094cf0c9dd..dbbdc9baa961 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -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
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index e02265d771bd..071f1c38ab95 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 02:44:50 +0000