[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Move -larchive from the general L...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8814ceacc6b
branches:  trunk
changeset: 645058:e8814ceacc6b
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Jan 22 09:19:47 2015 +0000

description:
Move -larchive from the general LIBS variable to each program that needs it,
prevents us from attempting to link the inplace libarchive against itself.
Fixes build on systems which do not include a native libarchive, and avoids
possible issues on systems which do.

Tested on SmartOS (no native libarchive) and OS X in both builtin and pkgsrc
configurations.  Ok joerg@.

diffstat:

 pkgtools/pkg_install/Makefile                 |  3 +--
 pkgtools/pkg_install/files/add/Makefile.in    |  4 ++--
 pkgtools/pkg_install/files/admin/Makefile.in  |  4 ++--
 pkgtools/pkg_install/files/create/Makefile.in |  4 ++--
 pkgtools/pkg_install/files/delete/Makefile.in |  4 ++--
 pkgtools/pkg_install/files/info/Makefile.in   |  4 ++--
 6 files changed, 11 insertions(+), 12 deletions(-)

diffs (107 lines):

diff -r c41be8922799 -r e8814ceacc6b pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Thu Jan 22 08:28:56 2015 +0000
+++ b/pkgtools/pkg_install/Makefile     Thu Jan 22 09:19:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.205 2015/01/20 19:15:56 adam Exp $
+# $NetBSD: Makefile,v 1.206 2015/01/22 09:19:47 jperkin Exp $
 
 # Notes to package maintainers:
 #
@@ -174,7 +174,6 @@
 .endif
 CPPFLAGS+=     -I${WRKDIR}/libfetch
 LDFLAGS+=      -L${WRKDIR}/libfetch
-LIBS+=         -larchive
 
 CONFIGURE_ENV+=        LIBS=${LIBS:Q}
 
diff -r c41be8922799 -r e8814ceacc6b pkgtools/pkg_install/files/add/Makefile.in
--- a/pkgtools/pkg_install/files/add/Makefile.in        Thu Jan 22 08:28:56 2015 +0000
+++ b/pkgtools/pkg_install/files/add/Makefile.in        Thu Jan 22 09:19:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.28 2013/09/12 11:03:10 jperkin Exp $
+# $NetBSD: Makefile.in,v 1.29 2015/01/22 09:19:47 jperkin Exp $
 
 srcdir=                @srcdir@
 
@@ -20,7 +20,7 @@
 
 SSL_SUPPORT=   @ssl_support@
 
-LIBS=          -linstall -lfetch
+LIBS=          -linstall -larchive -lfetch
 .if !empty(SSL_SUPPORT)
 LIBS+=         -lssl -lcrypto
 .endif
diff -r c41be8922799 -r e8814ceacc6b pkgtools/pkg_install/files/admin/Makefile.in
--- a/pkgtools/pkg_install/files/admin/Makefile.in      Thu Jan 22 08:28:56 2015 +0000
+++ b/pkgtools/pkg_install/files/admin/Makefile.in      Thu Jan 22 09:19:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.26 2013/09/12 11:03:10 jperkin Exp $
+# $NetBSD: Makefile.in,v 1.27 2015/01/22 09:19:47 jperkin Exp $
 
 srcdir=                @srcdir@
 
@@ -28,7 +28,7 @@
 SCRIPTS=       audit-packages download-vulnerability-list
 
 .if empty(BOOTSTRAP)
-LIBS=          -linstall -lfetch
+LIBS=          -linstall -larchive -lfetch
 .if !empty(SSL_SUPPORT)
 LIBS+=         -lssl -lcrypto
 CFLAGS+=       -DHAVE_SSL
diff -r c41be8922799 -r e8814ceacc6b pkgtools/pkg_install/files/create/Makefile.in
--- a/pkgtools/pkg_install/files/create/Makefile.in     Thu Jan 22 08:28:56 2015 +0000
+++ b/pkgtools/pkg_install/files/create/Makefile.in     Thu Jan 22 09:19:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.24 2013/09/12 11:03:10 jperkin Exp $
+# $NetBSD: Makefile.in,v 1.25 2015/01/22 09:19:47 jperkin Exp $
 
 srcdir=                @srcdir@
 
@@ -26,7 +26,7 @@
 SSL_SUPPORT=   @ssl_support@
 
 .if empty(BOOTSTRAP)
-LIBS=          -linstall -lfetch @LIBS@
+LIBS=          -linstall -larchive -lfetch @LIBS@
 .if !empty(SSL_SUPPORT)
 LIBS+=         -lssl -lcrypto
 .endif
diff -r c41be8922799 -r e8814ceacc6b pkgtools/pkg_install/files/delete/Makefile.in
--- a/pkgtools/pkg_install/files/delete/Makefile.in     Thu Jan 22 08:28:56 2015 +0000
+++ b/pkgtools/pkg_install/files/delete/Makefile.in     Thu Jan 22 09:19:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.21 2013/09/12 11:03:10 jperkin Exp $
+# $NetBSD: Makefile.in,v 1.22 2015/01/22 09:19:47 jperkin Exp $
 
 srcdir=                @srcdir@
 
@@ -15,7 +15,7 @@
 
 CC=            @CC@
 CCLD=          $(CC)
-LIBS=          -linstall -lfetch @LIBS@
+LIBS=          -linstall -larchive -lfetch @LIBS@
 
 .if !empty(SSL_SUPPORT)
 LIBS+=         -lssl -lcrypto
diff -r c41be8922799 -r e8814ceacc6b pkgtools/pkg_install/files/info/Makefile.in
--- a/pkgtools/pkg_install/files/info/Makefile.in       Thu Jan 22 08:28:56 2015 +0000
+++ b/pkgtools/pkg_install/files/info/Makefile.in       Thu Jan 22 09:19:47 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.27 2013/09/12 11:03:10 jperkin Exp $
+# $NetBSD: Makefile.in,v 1.28 2015/01/22 09:19:47 jperkin Exp $
 
 srcdir=                @srcdir@
 
@@ -17,7 +17,7 @@
 CC=            @CC@
 CCLD=          $(CC)
 .if empty(BOOTSTRAP)
-LIBS=          -linstall -lfetch @LIBS@
+LIBS=          -linstall -larchive -lfetch @LIBS@
 .if !empty(SSL_SUPPORT)
 LIBS+=         -lssl -lcrypto
 .endif