From owner-p4-projects@FreeBSD.ORG Fri May 7 10:13:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C22131065688; Fri, 7 May 2010 10:13:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 86AA21065680 for ; Fri, 7 May 2010 10:13:55 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 744258FC29 for ; Fri, 7 May 2010 10:13:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o47ADtDM083024 for ; Fri, 7 May 2010 10:13:55 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o47ADtFk083022 for perforce@freebsd.org; Fri, 7 May 2010 10:13:55 GMT (envelope-from gcooper@FreeBSD.org) Date: Fri, 7 May 2010 10:13:55 GMT Message-Id: <201005071013.o47ADtFk083022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 May 2010 10:13:56 -0000 http://p4web.freebsd.org/@@177893?ac=10 Change 177893 by gcooper@gcooper-bayonetta on 2010/05/07 10:12:55 1. Add a conditional block for libpkg . 2. Add libarchive to _prebuild_libs . 3. Move libfetch to _prebuild_libs for libpkg to avoid always building libfetch first serially unnecessarily. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#4 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#4 (text+ko) ==== @@ -1111,7 +1111,7 @@ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ lib/libbz2 lib/libcom_err lib/libcrypt \ - lib/libexpat lib/libfetch \ + lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ @@ -1177,6 +1177,10 @@ lib/libfetch__L lib/libradius__L: lib/libmd__L .endif +.if ${MK_PKGTOOLS} != "no" +_prebuild_libs+= lib/libarchive lib/libfetch +.endif + .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .if exists(${.CURDIR}/${_lib})