Date: Thu, 12 Oct 2006 03:08:02 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107721 for review Message-ID: <200610120308.k9C382OC077281@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107721 Change 107721 by jb@jb_freebsd8 on 2006/10/12 03:07:04 Remove my experimental threads-in-libc. It just muddies the waters at the moment. Affected files ... .. //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#6 edit .. //depot/projects/dtrace/src/tools/tools/netrate/http/Makefile#6 edit .. //depot/projects/dtrace/src/tools/tools/netrate/httpd/Makefile#6 edit .. //depot/projects/dtrace/src/usr.sbin/cached/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#6 (text+ko) ==== @@ -1,14 +1,8 @@ # $FreeBSD: src/tools/regression/tls/ttls4/Makefile,v 1.1 2005/04/23 23:47:58 davidxu Exp $ -.include <bsd.own.mk> - PROG= ttls4 -MK_MAN= no +LDADD+= -lpthread +NO_MAN= DEBUG_FLAGS= -g -.if ${MK_LIBC_THREADS} == "no" -DPADD+= ${LIBPTHREAD} -LDADD+= -lpthread -.endif - .include <bsd.prog.mk> ==== //depot/projects/dtrace/src/tools/tools/netrate/http/Makefile#6 (text+ko) ==== @@ -1,14 +1,9 @@ # $FreeBSD: src/tools/tools/netrate/http/Makefile,v 1.1 2005/10/06 08:41:08 rwatson Exp $ -.include <bsd.own.mk> - PROG= http WARNS= 3 -MK_MAN= no - -.if ${MK_LIBC_THREADS} == "no" +NO_MAN= DPADD= ${LIBPTHREAD} LDADD= -lpthread -.endif .include <bsd.prog.mk> ==== //depot/projects/dtrace/src/tools/tools/netrate/httpd/Makefile#6 (text+ko) ==== @@ -1,14 +1,9 @@ # $FreeBSD: src/tools/tools/netrate/httpd/Makefile,v 1.1 2005/10/06 08:41:08 rwatson Exp $ -.include <bsd.own.mk> - PROG= httpd WARNS= 3 -MK_MAN= no - -.if ${MK_LIBC_THREADS} == "no" +NO_MAN= DPADD= ${LIBPTHREAD} LDADD= -lpthread -.endif .include <bsd.prog.mk> ==== //depot/projects/dtrace/src/usr.sbin/cached/Makefile#4 (text) ==== @@ -1,7 +1,5 @@ # $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 @@ -11,14 +9,8 @@ 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} ${LIBUTIL} -LDADD+=${LIBM} ${LIBUTIL} - -.if ${MK_LIBC_THREADS} == "no" -DPADD+=${LIBPTHREAD} -LDADD+=${LIBPTHREAD} -.endif - +DPADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} +LDADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} LDFLAGS+= -Xlinker --export-dynamic .PATH: ${.CURDIR}/agents
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610120308.k9C382OC077281>