diff options
author | jperkin <jperkin@pkgsrc.org> | 2015-01-22 09:19:47 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2015-01-22 09:19:47 +0000 |
commit | aa13cae81981f688f7c6d1277dbfbc6804ffc995 (patch) | |
tree | 9456bc6df1906aee6698c4dcf97798a06928d8d9 /pkgtools/pkg_install | |
parent | f53ef36f7894c38124504f9a42d816baf307fb87 (diff) | |
download | pkgsrc-aa13cae81981f688f7c6d1277dbfbc6804ffc995.tar.gz |
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 (limited to 'pkgtools/pkg_install')
-rw-r--r-- | pkgtools/pkg_install/Makefile | 3 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/add/Makefile.in | 4 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/admin/Makefile.in | 4 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/create/Makefile.in | 4 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/delete/Makefile.in | 4 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/info/Makefile.in | 4 |
6 files changed, 11 insertions, 12 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 9c8134668e6..97dc40f4fad 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -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 @@ pre-configure: config-guess-override config-sub-override .endif CPPFLAGS+= -I${WRKDIR}/libfetch LDFLAGS+= -L${WRKDIR}/libfetch -LIBS+= -larchive CONFIGURE_ENV+= LIBS=${LIBS:Q} diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in index 1b313d845bc..d95046040d9 100644 --- a/pkgtools/pkg_install/files/add/Makefile.in +++ b/pkgtools/pkg_install/files/add/Makefile.in @@ -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 @@ LDFLAGS= @LDFLAGS@ -L../lib SSL_SUPPORT= @ssl_support@ -LIBS= -linstall -lfetch +LIBS= -linstall -larchive -lfetch .if !empty(SSL_SUPPORT) LIBS+= -lssl -lcrypto .endif diff --git a/pkgtools/pkg_install/files/admin/Makefile.in b/pkgtools/pkg_install/files/admin/Makefile.in index bfbc61cb92d..8727ed03d41 100644 --- a/pkgtools/pkg_install/files/admin/Makefile.in +++ b/pkgtools/pkg_install/files/admin/Makefile.in @@ -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 @@ PROG= pkg_admin 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 --git a/pkgtools/pkg_install/files/create/Makefile.in b/pkgtools/pkg_install/files/create/Makefile.in index c03822a1e3f..f1ae15db9b4 100644 --- a/pkgtools/pkg_install/files/create/Makefile.in +++ b/pkgtools/pkg_install/files/create/Makefile.in @@ -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 @@ PROG= pkg_create 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 --git a/pkgtools/pkg_install/files/delete/Makefile.in b/pkgtools/pkg_install/files/delete/Makefile.in index d4f9a4c9404..140670ac72f 100644 --- a/pkgtools/pkg_install/files/delete/Makefile.in +++ b/pkgtools/pkg_install/files/delete/Makefile.in @@ -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 @@ SSL_SUPPORT= @ssl_support@ CC= @CC@ CCLD= $(CC) -LIBS= -linstall -lfetch @LIBS@ +LIBS= -linstall -larchive -lfetch @LIBS@ .if !empty(SSL_SUPPORT) LIBS+= -lssl -lcrypto diff --git a/pkgtools/pkg_install/files/info/Makefile.in b/pkgtools/pkg_install/files/info/Makefile.in index 4bb232ef2a3..667af3cc22f 100644 --- a/pkgtools/pkg_install/files/info/Makefile.in +++ b/pkgtools/pkg_install/files/info/Makefile.in @@ -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 @@ SSL_SUPPORT= @ssl_support@ CC= @CC@ CCLD= $(CC) .if empty(BOOTSTRAP) -LIBS= -linstall -lfetch @LIBS@ +LIBS= -linstall -larchive -lfetch @LIBS@ .if !empty(SSL_SUPPORT) LIBS+= -lssl -lcrypto .endif |