From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:08:04 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 4B91F16A4CA; Thu, 12 Oct 2006 03:08:04 +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 12AED16A492 for ; Thu, 12 Oct 2006 03:08:04 +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 9334B43D4C for ; Thu, 12 Oct 2006 03:08:02 +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 k9C382nM077288 for ; Thu, 12 Oct 2006 03:08:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C382OC077281 for perforce@freebsd.org; Thu, 12 Oct 2006 03:08:02 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:08:02 GMT Message-Id: <200610120308.k9C382OC077281@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 107721 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: Thu, 12 Oct 2006 03:08:04 -0000 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 - PROG= ttls4 -MK_MAN= no +LDADD+= -lpthread +NO_MAN= DEBUG_FLAGS= -g -.if ${MK_LIBC_THREADS} == "no" -DPADD+= ${LIBPTHREAD} -LDADD+= -lpthread -.endif - .include ==== //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 - PROG= http WARNS= 3 -MK_MAN= no - -.if ${MK_LIBC_THREADS} == "no" +NO_MAN= DPADD= ${LIBPTHREAD} LDADD= -lpthread -.endif .include ==== //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 - PROG= httpd WARNS= 3 -MK_MAN= no - -.if ${MK_LIBC_THREADS} == "no" +NO_MAN= DPADD= ${LIBPTHREAD} LDADD= -lpthread -.endif .include ==== //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 - 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