From owner-p4-projects@FreeBSD.ORG Sat Aug 5 22:10:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BF0016A4DD; Sat, 5 Aug 2006 22:10:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 166C716A4DF for ; Sat, 5 Aug 2006 22:10:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC26343D46 for ; Sat, 5 Aug 2006 22:10:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75MAtpT056349 for ; Sat, 5 Aug 2006 22:10:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75MAtar056300 for perforce@freebsd.org; Sat, 5 Aug 2006 22:10:55 GMT (envelope-from jb@freebsd.org) Date: Sat, 5 Aug 2006 22:10:55 GMT Message-Id: <200608052210.k75MAtar056300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 22:10:56 -0000 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 + 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 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 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 + PROG= http WARNS= 3 -NO_MAN= -CFLAGS+=-pthread -DPADD+= ${LIBPTHREAD} +MK_MAN= no + +.if ${MK_LIBC_THREADS} == "no" +DPADD= ${LIBPTHREAD} +LDADD= -lpthread +.endif .include ==== //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 + PROG= httpd WARNS= 3 -NO_MAN= -CFLAGS+=-pthread -DPADD+= ${LIBPTHREAD} +MK_MAN= no + +.if ${MK_LIBC_THREADS} == "no" +DPADD= ${LIBPTHREAD} +LDADD= -lpthread +.endif .include ==== //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 + PROG= juggle -NO_MAN= +MK_MAN= no WARNS= 3 -CFLAGS+=-pthread -DPADD+= ${LIBPTHREAD} + +.if ${MK_LIBC_THREADS} == "no" +LDADD= -lpthread +DPADD= ${LIBPTHREAD} +.endif .include