diff options
-rw-r--r-- | Makefile.inc1 | 2 | ||||
-rw-r--r-- | cddl/lib/Makefile | 2 | ||||
-rw-r--r-- | cddl/usr.bin/Makefile | 2 | ||||
-rw-r--r-- | cddl/usr.sbin/Makefile | 2 | ||||
-rw-r--r-- | lib/Makefile | 2 | ||||
-rw-r--r-- | lib/libthr/Makefile | 4 | ||||
-rw-r--r-- | sbin/ggate/Makefile | 2 | ||||
-rw-r--r-- | share/man/man3/Makefile | 2 | ||||
-rw-r--r-- | share/man/man5/src.conf.5 | 30 | ||||
-rw-r--r-- | share/mk/bsd.compat.mk | 1 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 6 | ||||
-rw-r--r-- | usr.bin/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/ngctl/Makefile | 2 |
14 files changed, 36 insertions, 27 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 66816ce..ff8c924 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1030,7 +1030,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} -.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" && ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" _default_thread_lib= lib/${DEFAULT_THREAD_LIB} .elif ${MK_LIBTHR} != "no" _default_thread_lib= lib/libthr diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index f517dfe..522dda7 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" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _libzpool= libzpool .endif .endif diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile index 0ec5310..439a2c9 100644 --- a/cddl/usr.bin/Makefile +++ b/cddl/usr.bin/Makefile @@ -5,7 +5,7 @@ SUBDIR= ${_ztest} .if ${MK_ZFS} != "no" -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _ztest= ztest .endif .endif diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile index 5caee34..913e2ae 100644 --- a/cddl/usr.sbin/Makefile +++ b/cddl/usr.sbin/Makefile @@ -5,7 +5,7 @@ SUBDIR= ${_zdb} .if ${MK_ZFS} != "no" -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _zdb= zdb .endif .endif diff --git a/lib/Makefile b/lib/Makefile index 0f45151..4661125 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -100,7 +100,6 @@ _libsmb= libsmb _libsmb= libsmb .endif -.if ${MK_LIBPTHREAD} != "no" .if ${MK_LIBKSE} != "no" _libkse= libkse .endif @@ -108,7 +107,6 @@ _libkse= libkse .if ${MK_LIBTHR} != "no" _libthr= libthr .endif -.endif .if ${MACHINE_ARCH} != "arm" _libthread_db= libthread_db diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 71202ca..a0f4069 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -10,7 +10,7 @@ .include <bsd.own.mk> -.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \ +.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBKSE} == "no") && \ ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif @@ -44,7 +44,7 @@ PRECIOUSLIB= .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no" +.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 diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile index e889f2f..38ca2f2 100644 --- a/sbin/ggate/Makefile +++ b/sbin/ggate/Makefile @@ -6,7 +6,7 @@ SUBDIR= ${_ggatec} \ ${_ggated} \ ggatel -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _ggatec= ggatec _ggated= ggated .endif diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 5ff093f..a3da4e6 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -146,7 +146,7 @@ MLINKS+= tree.3 RB_EMPTY.3 \ tree.3 SPLAY_RIGHT.3 \ tree.3 SPLAY_ROOT.3 -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" PTHREAD_MAN= pthread.3 \ pthread_atfork.3 \ pthread_attr.3 \ diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 3a38aef..40f8922 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: src/tools/build/options/makeman,v 1.6 2006/09/11 13:39:44 ru Exp .\" $FreeBSD$ -.Dd August 27, 2007 +.Dd October 9, 2007 .Dt SRC.CONF 5 .Os .Sh NAME @@ -380,26 +380,34 @@ On amd64, set to not build 32-bit library set and a .Nm ld-elf32.so.1 runtime linker. .It Va WITHOUT_LIBKSE -.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBKSE,v 1.1 2006/03/21 07:50:50 obrien Exp +.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBKSE,v 1.1 2007/10/09 13:42:33 obrien Exp Set to not build the .Nm libkse (M:N threading) library. -.It Va WITHOUT_LIBTHR -.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBTHR,v 1.1 2006/03/21 07:50:50 ru Exp -Set to not build the -.Nm libthr -(1:1 threading) -library. .It Va WITHOUT_LIBPTHREAD -.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBPTHREAD,v 1.1 2006/03/21 07:50:50 ru Exp +.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBPTHREAD,v 1.2 2007/10/09 13:42:33 obrien Exp Set to not build either of the .Nm libpthread -providing libraries ( -.Nm libthr +providing libraries +.Nm ( libthr (1:1) & .Nm libkse (M:N)). +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_LIBKSE +.It +.Va WITHOUT_LIBTHR +.El +.It Va WITHOUT_LIBTHR +.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBTHR,v 1.1 2006/03/21 07:50:50 ru Exp +Set to not build the +.Nm libthr +(1:1 threading) +library. .It Va WITHOUT_LOCALES .\" from FreeBSD: src/tools/build/options/WITHOUT_LOCALES,v 1.1 2006/03/21 07:50:50 ru Exp Set to not build localization files; see diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 5c3a875..dfa5dfc 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -16,7 +16,6 @@ NOINFOCOMPRESS:NO_INFOCOMPRESS \ NOINSTALLLIB:NO_INSTALLLIB \ NOLIBPTHREAD:NO_LIBPTHREAD \ - NOLIBKSE:NO_LIBKSE \ NOLIBTHR:NO_LIBTHR \ NOLINT:NO_LINT \ NOMAN:NO_MAN \ diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 92f3b3b..941950f 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -239,7 +239,6 @@ WITHOUT_${var}= KERBEROS \ LIB32 \ LIBPTHREAD \ - LIBKSE \ LIBTHR \ LOCALES \ LPR \ @@ -426,6 +425,11 @@ MK_KERBEROS:= no MK_NCP:= no .endif +.if ${MK_LIBPTHREAD} == "no" +MK_LIBKSE:= no +MK_LIBTHR:= no +.endif + .if ${MK_OPENSSL} == "no" MK_OPENSSH:= no MK_KERBEROS:= no diff --git a/usr.bin/Makefile b/usr.bin/Makefile index ebc5d4c..c2eefc8 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -260,7 +260,7 @@ _calendar= calendar .if ${MK_OPENSSL} != "no" _chkey= chkey _newkey= newkey -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _csup= csup .endif .endif diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index c4bfd25..f6a2fcc 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -268,7 +268,7 @@ _ypset= ypset _authpf= authpf .endif -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _pppctl= pppctl .endif @@ -277,7 +277,7 @@ _lpr= lpr .endif .if ${MK_NS_CACHING} != "no" -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _nscd= nscd .endif .endif diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile index 1a9e50b..e02265d 100644 --- a/usr.sbin/ngctl/Makefile +++ b/usr.sbin/ngctl/Makefile @@ -13,7 +13,7 @@ WARNS?= 3 NGCTL_NO_LIBEDIT= .endif -.if ${MK_LIBPTHREAD} == "no" && ${MK_LIBTHR} == "no" && ${MK_LIBKSE} +.if ${MK_LIBTHR} == "no" && ${MK_LIBKSE} == "no" NGCTL_NO_LIBEDIT= .endif |