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

Tweak the handling of "WITHOUT_LIBPTHREAD". Also remove the accidental

Browse Source 
treatment of 'LIBKSE' as an "old style" knob.

Submitted by:	ru
Approved by:	re(kensmith)
This commit is contained in:
David E. O'Brien 2007-10-09 23:31:11 +00:00
parent 8846f7d296
commit 946367b8e2
14 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -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

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" || ${MK_LIBPTHREAD} != "no"
.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
_libzpool= libzpool
.endif
.endif

2
cddl/usr.bin/Makefile
View File

@ -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

2
cddl/usr.sbin/Makefile
View File

@ -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

2
lib/Makefile
View File

@ -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

4
lib/libthr/Makefile
View File

@ -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

2
sbin/ggate/Makefile
View File

@ -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

2
share/man/man3/Makefile
View File

@ -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 \

30
share/man/man5/src.conf.5
View File

@ -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_LIBPTHREAD
.\" 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
(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_LIBPTHREAD
.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBPTHREAD,v 1.1 2006/03/21 07:50:50 ru Exp
Set to not build either of the
.Nm libpthread
providing libraries (
.Nm libthr
(1:1) &
.Nm libkse
(M:N)).
.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

1
share/mk/bsd.compat.mk
View File

@ -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 \

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

@ -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

2
usr.bin/Makefile
View File

@ -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

4
usr.sbin/Makefile
View File

@ -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

2
usr.sbin/ngctl/Makefile
View File

@ -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