PERFORCE change 178905 for review

Garrett Cooper gcooper at FreeBSD.org
Fri May 28 09:30:11 UTC 2010


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

Change 178905 by gcooper at gcooper-bayonetta on 2010/05/28 09:30:04

	Define the fact that libarchive support is only directly required for
	pkg_create.

Affected files ...

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

Differences ...

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

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

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

@@ -19,7 +19,7 @@
 WARNS?=				3
 WFORMAT?=			1
 
-DPADD+=	${LIBPKG_INSTALL}
-LPADD+=	${LIBPKG_INSTALL}
+DPADD+=	${LIBPKG_INSTALL} ${LIBARCHIVE}
+LPADD+=	${LIBPKG_INSTALL} -larchive
 
 .include <bsd.prog.mk>


More information about the p4-projects mailing list