Date: Fri, 14 Jul 2006 05:21:09 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 101515 for review Message-ID: <200607140521.k6E5L9G8034975@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101515 Change 101515 by jb@jb_freebsd2 on 2006/07/14 05:20:11 Allow for threads built into libc. Affected files ... .. //depot/projects/dtrace/src/usr.sbin/cached/Makefile#2 edit .. //depot/projects/dtrace/src/usr.sbin/pppctl/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/usr.sbin/cached/Makefile#2 (text) ==== @@ -1,5 +1,7 @@ # $FreeBSD: src/usr.sbin/cached/Makefile,v 1.1 2006/04/28 12:03:37 ume Exp $ +.include <bsd.own.mk> + PROG=cached PROGNAME=cached MAN=cached.conf.5 cached.8 @@ -9,8 +11,14 @@ 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} +DPADD+=${LIBM} ${LIBUTIL} +LDADD+=${LIBM} ${LIBUTIL} + +.if ${MK_LIBC_THREADS} == "no" +DPADD+=${LIBPTHREAD} +LDADD+=${LIBPTHREAD} +.endif + LDFLAGS+= -Xlinker --export-dynamic .PATH: ${.CURDIR}/agents ==== //depot/projects/dtrace/src/usr.sbin/pppctl/Makefile#3 (text+ko) ==== @@ -1,9 +1,16 @@ # $FreeBSD: src/usr.sbin/pppctl/Makefile,v 1.16 2004/01/31 17:28:09 marcel Exp $ +.include <bsd.own.mk> + PROG= pppctl MAN= pppctl.8 -DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP} -LDADD= -lpthread -ledit -ltermcap +DPADD= ${LIBEDIT} ${LIBTERMCAP} +LDADD= -ledit -ltermcap + +.if ${MK_LIBC_THREADS} == "no" +DPADD= ${LIBPTHREAD} +LDADD= -lpthread +.endif .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607140521.k6E5L9G8034975>