- When building world WITHOUT_LIBPTHREAD, link libthr to libpthread.

- Don't build ngctl(8) and cached(8) if threading libs aren't built.
- Fix various issues in a cached(8) makefile.

6 files changed, 41 insertions, 46 deletions

diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index e211586..4b8ce51 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -8,12 +8,12 @@
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 
-.if ${MACHINE_ARCH} == "sparc64"
-SHLIBDIR?= /lib
-.endif
-
 .include <bsd.own.mk>
 
+.if ${MACHINE_ARCH} == "sparc64" || ${MK_LIBPTHREAD} == "no"
+SHLIBDIR= /lib
+.endif
+
 LIB=thr
 SHLIB_MAJOR= 2
 CFLAGS+=-DPTHREAD_KERNEL
@@ -42,7 +42,7 @@ PRECIOUSLIB=
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_ARCH} == "sparc64" || ${MK_LIBPTHREAD} == "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 73a8016..989589f 100644
--- a/sbin/ggate/Makefile
+++ b/sbin/ggate/Makefile
@@ -6,12 +6,8 @@ SUBDIR=	${_ggatec} \
 	${_ggated} \
 	ggatel
 
-.if ${MACHINE_ARCH} == "sparc64"
-.if ${MK_LIBTHR} != "no"
-_ggatec=	ggatec
-_ggated=	ggated
-.endif
-.elif ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBTHR} != "no" || \
+    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")   
 _ggatec=	ggatec
 _ggated=	ggated
 .endif
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 5b7ad04..04d62116 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -262,11 +262,8 @@ _calendar=	calendar
 .if ${MK_OPENSSL} != "no"
 _chkey=		chkey
 _newkey=	newkey
-.if ${MACHINE_ARCH} == "sparc64"
-.if ${MK_LIBTHR} != "no"
-_csup=		csup
-.endif
-.elif ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBTHR} != "no" || \
+    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")   
 _csup=		csup
 .endif
 .endif
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 5d8db93..18ea120 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -105,7 +105,7 @@ SUBDIR=	ac \
 	${_ndp} \
 	newsyslog \
 	nfsd \
-	ngctl \
+	${_ngctl} \
 	nghook \
 	nologin \
 	ntp \
@@ -226,10 +226,6 @@ _rndc-confgen=		rndc-confgen
 _bluetooth=	bluetooth
 .endif
 
-.if ${MK_NS_CACHING} != "no"
-_cached=       cached
-.endif
-
 .if ${MK_OPENSSL} != "no"
 _keyserv=	keyserv
 .endif
@@ -267,10 +263,22 @@ _ypset=		ypset
 _authpf=	authpf
 .endif
 
+.if ${MK_LIBTHR} != "no" || \
+    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")
+_ngctl=		ngctl
+.endif
+
 .if ${MK_LPR} != "no"
 _lpr=		lpr
 .endif
 
+.if ${MK_NS_CACHING} != "no"
+.if ${MK_LIBTHR} != "no" || \
+    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")
+_cached=	cached
+.endif
+.endif
+
 .if ${MK_SENDMAIL} != "no"
 _editmap=	editmap
 _mailstats=	mailstats
@@ -305,7 +313,7 @@ _mount_smbfs=	mount_smbfs
 _mptable=	mptable
 _ndiscvt=	ndiscvt
 _pnpinfo=	pnpinfo
-.if ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
 _pppctl=	pppctl
 .endif
 _sicontrol=	sicontrol
@@ -341,7 +349,7 @@ _mount_nwfs=	mount_nwfs
 _mount_smbfs=	mount_smbfs
 _mptable=	mptable
 _ndiscvt=	ndiscvt
-.if ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
 _pppctl=	pppctl
 .endif
 _sicontrol=	sicontrol
@@ -355,7 +363,7 @@ _acpi=		acpi
 .endif
 _kgmon=		kgmon
 _mount_smbfs=	mount_smbfs
-.if ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
 _pppctl=	pppctl
 .endif
 _zzz=		zzz
diff --git a/usr.sbin/cached/Makefile b/usr.sbin/cached/Makefile
index 5478341..4dfd514 100644
--- a/usr.sbin/cached/Makefile
+++ b/usr.sbin/cached/Makefile
@@ -1,19 +1,16 @@
 # $FreeBSD$
 
-PROG=cached
-PROGNAME=cached
-MAN=cached.conf.5 cached.8
+PROG=	cached
+MAN=	cached.conf.5 cached.8
 
-WARNS?=2
-SRCS= agent.c cached.c cachedcli.c cachelib.c cacheplcs.c debug.c log.c \
+WARNS?=	2
+SRCS=	agent.c cached.c cachedcli.c cachelib.c cacheplcs.c debug.c log.c \
 	config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \
 	parser.c
 CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\""
-DPADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL}
-LDADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL}
-LDFLAGS+= -Xlinker --export-dynamic
+DPADD=	${LIBM} ${LIBPTHREAD} ${LIBUTIL}
+LDADD=	-lm -lpthread -lutil
 
-.PATH:	${.CURDIR}/agents
-.include "agents/Makefile.inc"
-.include "../Makefile.inc"
+.PATH: ${.CURDIR}/agents
+.include "${.CURDIR}/agents/Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/usr.sbin/nscd/Makefile b/usr.sbin/nscd/Makefile
index 5478341..4dfd514 100644
--- a/usr.sbin/nscd/Makefile
+++ b/usr.sbin/nscd/Makefile
@@ -1,19 +1,16 @@
 # $FreeBSD$
 
-PROG=cached
-PROGNAME=cached
-MAN=cached.conf.5 cached.8
+PROG=	cached
+MAN=	cached.conf.5 cached.8
 
-WARNS?=2
-SRCS= agent.c cached.c cachedcli.c cachelib.c cacheplcs.c debug.c log.c \
+WARNS?=	2
+SRCS=	agent.c cached.c cachedcli.c cachelib.c cacheplcs.c debug.c log.c \
 	config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \
 	parser.c
 CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\""
-DPADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL}
-LDADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL}
-LDFLAGS+= -Xlinker --export-dynamic
+DPADD=	${LIBM} ${LIBPTHREAD} ${LIBUTIL}
+LDADD=	-lm -lpthread -lutil
 
-.PATH:	${.CURDIR}/agents
-.include "agents/Makefile.inc"
-.include "../Makefile.inc"
+.PATH: ${.CURDIR}/agents
+.include "${.CURDIR}/agents/Makefile.inc"
 .include <bsd.prog.mk>