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

- When building world WITHOUT_LIBPTHREAD, link libthr to libpthread.

Browse Source 
- Don't build ngctl(8) and cached(8) if threading libs aren't built.
- Fix various issues in a cached(8) makefile.
This commit is contained in:
ru 2006-11-26 14:36:34 +00:00
parent c2e4cdb2da
commit 815d860c2f
6 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libthr/Makefile
View File

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

8
sbin/ggate/Makefile
View File

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

7
usr.bin/Makefile
View File

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

24
usr.sbin/Makefile
View File

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

19
usr.sbin/cached/Makefile
View File

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

19
usr.sbin/nscd/Makefile
View File

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