Date: Sat, 5 Aug 2006 22:10:55 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 103287 for review Message-ID: <200608052210.k75MAtar056300@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=103287 Change 103287 by jb@jb_freebsd2 on 2006/08/05 22:10:10 Build changes to allow for threads being built into libc or not. Affected files ... .. //depot/projects/dtrace/src/tools/regression/lib/libc/resolv/Makefile#4 edit .. //depot/projects/dtrace/src/tools/regression/tls/ttls2/Makefile#4 edit .. //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#4 edit .. //depot/projects/dtrace/src/tools/tools/netrate/http/Makefile#4 edit .. //depot/projects/dtrace/src/tools/tools/netrate/httpd/Makefile#4 edit .. //depot/projects/dtrace/src/tools/tools/netrate/juggle/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/tools/regression/lib/libc/resolv/Makefile#4 (text+ko) ==== @@ -1,11 +1,17 @@ # $NetBSD: Makefile,v 1.1 2004/05/13 19:17:12 christos Exp $ # $FreeBSD: src/tools/regression/lib/libc/resolv/Makefile,v 1.4 2006/03/15 10:46:34 ru Exp $ +.include <bsd.own.mk> + PROG= resolv -NO_MAN= +MK_MAN= no # Note: this test relies on being dynamically linked. You will get a # spurious PASS for a statically linked test. +.if ${MK_LIBC_THREADS} == "no" +DPADD+= ${LIBPTHREAD} +LDADD+= -lpthread +.endif regress: ${PROG} ./${PROG} -r ${.CURDIR}/mach ==== //depot/projects/dtrace/src/tools/regression/tls/ttls2/Makefile#4 (text+ko) ==== @@ -3,7 +3,7 @@ .include <bsd.own.mk> PROG= ttls2 -NO_MAN= +MK_MAN= no DEBUG_FLAGS= -g .if ${MK_LIBC_THREADS} == "no" ==== //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#4 (text+ko) ==== @@ -3,7 +3,7 @@ .include <bsd.own.mk> PROG= ttls4 -NO_MAN= +MK_MAN= no DEBUG_FLAGS= -g .if ${MK_LIBC_THREADS} == "no" ==== //depot/projects/dtrace/src/tools/tools/netrate/http/Makefile#4 (text+ko) ==== @@ -1,9 +1,14 @@ # $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 -NO_MAN= -CFLAGS+=-pthread -DPADD+= ${LIBPTHREAD} +MK_MAN= no + +.if ${MK_LIBC_THREADS} == "no" +DPADD= ${LIBPTHREAD} +LDADD= -lpthread +.endif .include <bsd.prog.mk> ==== //depot/projects/dtrace/src/tools/tools/netrate/httpd/Makefile#4 (text+ko) ==== @@ -1,9 +1,14 @@ # $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 -NO_MAN= -CFLAGS+=-pthread -DPADD+= ${LIBPTHREAD} +MK_MAN= no + +.if ${MK_LIBC_THREADS} == "no" +DPADD= ${LIBPTHREAD} +LDADD= -lpthread +.endif .include <bsd.prog.mk> ==== //depot/projects/dtrace/src/tools/tools/netrate/juggle/Makefile#4 (text+ko) ==== @@ -1,9 +1,14 @@ # $FreeBSD: src/tools/tools/netrate/juggle/Makefile,v 1.2 2006/03/15 10:46:38 ru Exp $ +.include <bsd.own.mk> + PROG= juggle -NO_MAN= +MK_MAN= no WARNS= 3 -CFLAGS+=-pthread -DPADD+= ${LIBPTHREAD} + +.if ${MK_LIBC_THREADS} == "no" +LDADD= -lpthread +DPADD= ${LIBPTHREAD} +.endif .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608052210.k75MAtar056300>