path: root/cddl
diff options
authorKyle Evans <kevans@FreeBSD.org>2021-01-20 14:01:25 +0000
committerKyle Evans <kevans@FreeBSD.org>2021-01-22 18:33:27 +0000
commit123ae3045dd21badb93ce52445e18e364b3ac807 (patch)
tree258d0de8b41a1caa4b2a7cef3929c0c58847605f /cddl
parentc0a9a0cb1f3745dc6537861d8bdc43750e686794 (diff)
build: remove LIBPTHREAD/LIBTHR build options
WITHOUT_LIBTHR has been broken for a little over five years now, since the xz 5.2.0 update introduced a hard liblzma dependency on libthr, and building a useful system without threading support is becoming increasingly more difficult. Additionally, in the five plus years that it's been broken more reverse dependencies have cropped up in libzstd, libsqlite3, and libcrypto (among others) that make it more and more difficult to reconcile the effort needed to fix these options. Remove the broken options. PR: 252760 Reviewed by: brooks, emaste, kib Differential Revision: https://reviews.freebsd.org/D28263
Diffstat (limited to 'cddl')
3 files changed, 0 insertions, 6 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 38ab0358dde6..2f360a8684a2 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -28,11 +28,9 @@ _libicp_rescue= libicp_rescue
_libzfs= libzfs
_libzutil= libzutil
_libzfsbootenv= libzfsbootenv
-.if ${MK_LIBTHR} != "no"
_libzpool= libzpool
_libtpool= libtpool
SUBDIR_DEPEND_libctf= libspl
SUBDIR_DEPEND_libdtrace= libctf
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 8c7fa3ac83fa..5c2595df1c9f 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -15,12 +15,10 @@ SUBDIR.${MK_TESTS}+= tests
.if ${MK_ZFS} != "no"
_zinject= zinject
-.if ${MK_LIBTHR} != "no"
_ztest= ztest
_zstream = zstream
_zstreamdump = zstreamdump
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index a736a75a73ec..42de5c96c53a 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -13,10 +13,8 @@ SUBDIR= ${_dtrace} \
SUBDIR.${MK_TESTS}+= tests
.if ${MK_ZFS} != "no"
-.if ${MK_LIBTHR} != "no"
_zdb= zdb
_zhack= zhack
. if ${MK_CXX} != "no"
_zfsd= zfsd
. endif