From owner-p4-projects@FreeBSD.ORG  Fri May 28 10:02:47 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F238E1065676; Fri, 28 May 2010 10:02:46 +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 B6C291065670
	for <perforce@FreeBSD.org>; Fri, 28 May 2010 10:02:46 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A43F48FC1A
	for <perforce@FreeBSD.org>; Fri, 28 May 2010 10:02:46 +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 o4SA2kUq019979
	for <perforce@FreeBSD.org>; Fri, 28 May 2010 10:02:46 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4SA2kkj019977
	for perforce@freebsd.org; Fri, 28 May 2010 10:02:46 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Fri, 28 May 2010 10:02:46 GMT
Message-Id: <201005281002.o4SA2kkj019977@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178908 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 May 2010 10:02:47 -0000

http://p4web.freebsd.org/@@178908?ac=10

Change 178908 by gcooper@gcooper-bayonetta on 2010/05/28 10:01:55

	Fix the build by jamming ${LIBPKG_INSTALL} up at the top.
	
	For whatever reason shoving it in the child Makefiles screwed up
	the build for everything that required libpkg_install.a (wasn't
	finding all of the symbols because the linker arg wasn't on the
	command line... weird).
	
	There has to be a better way, but at least this stuff works for the
	time being.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/Makefile.inc#7 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/Makefile.inc#7 (text+ko) ====

@@ -7,8 +7,8 @@
 CFLAGS+=	-DI_READ_THE_LIBPKG_INSTALL_MAKEFILE_AND_I_UNDERSTAND_ITS_PURPOSE
 CFLAGS+=	-I${.CURDIR}/../lib
 
-DPADD+=		${LIBPKG}
-LDADD+=		-lpkg
+DPADD+=		${LIBPKG} ${LIBPKG_INSTALL}
+LDADD+=		-lpkg ${LIBPKG_INSTALL}
 
 # Inherit BINDIR from one level up.
 .include "../Makefile.inc"