PERFORCE change 178908 for review

Garrett Cooper gcooper at FreeBSD.org
Fri May 28 10:02:47 UTC 2010


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

Change 178908 by gcooper at 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"


More information about the p4-projects mailing list