From owner-p4-projects@FreeBSD.ORG Tue May 27 03:41:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE855106567A; Tue, 27 May 2008 03:41:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 70B961065674 for ; Tue, 27 May 2008 03:41:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5CE648FC12 for ; Tue, 27 May 2008 03:41:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4R3fNZ1029849 for ; Tue, 27 May 2008 03:41:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4R3fNm5029847 for perforce@freebsd.org; Tue, 27 May 2008 03:41:23 GMT (envelope-from jb@freebsd.org) Date: Tue, 27 May 2008 03:41:23 GMT Message-Id: <200805270341.m4R3fNm5029847@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 142353 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: Tue, 27 May 2008 03:41:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=142353 Change 142353 by jb@freebsd3 on 2008/05/27 03:41:17 Put KSE back in. Affected files ... .. //depot/projects/dtrace7/src/share/mk/bsd.own.mk#6 edit Differences ... ==== //depot/projects/dtrace7/src/share/mk/bsd.own.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.own.mk,v 1.74 2008/03/29 17:44:39 ru Exp $ +# $FreeBSD: src/share/mk/bsd.own.mk,v 1.67.2.4 2008/01/28 08:42:15 dougb Exp $ # # The include file set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -162,6 +162,8 @@ NLSGRP?= ${SHAREGRP} NLSMODE?= ${NOBINMODE} +DEFAULT_THREAD_LIB?= libthr + INCLUDEDIR?= /usr/include # Common variables @@ -326,6 +328,7 @@ KVM \ LIB32 \ LIBPTHREAD \ + LIBKSE \ LIBTHR \ LOCALES \ LPR \ @@ -356,8 +359,8 @@ TOOLCHAIN \ USB \ WPA_SUPPLICANT_EAPOL \ - ZFS \ - ZONEINFO + ZONEINFO \ + ZFS .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif @@ -396,10 +399,11 @@ # Order is somewhat important. # .if ${MK_LIBPTHREAD} == "no" +MK_LIBKSE:= no MK_LIBTHR:= no .endif -.if ${MK_LIBTHR} == "no" +.if ${MK_LIBKSE} == "no" && ${MK_LIBTHR} == "no" MK_BIND:= no .endif