diff options
author | jperkin <jperkin@pkgsrc.org> | 2015-09-07 09:06:04 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2015-09-07 09:06:04 +0000 |
commit | 1cb95545598179fd986b73d088a33bca83739a40 (patch) | |
tree | bd29da43685c04e804767c698b07b3735907f607 /pkgtools/pkg_install | |
parent | c8d3472666998a7957e5bd47134483f5caf82169 (diff) | |
download | pkgsrc-1cb95545598179fd986b73d088a33bca83739a40.tar.gz |
Explicitly link against -lbz2 and -lz to satisfy libnetpgpverify
dependencies, we can no longer rely on implicit linking from libarchive
on certain platforms. Fixes build on FreeBSD and DragonFlyBSD.
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, 12 insertions, 11 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 9835aa90818..b6be8b52d52 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.210 2015/09/06 18:38:21 jperkin Exp $ +# $NetBSD: Makefile,v 1.211 2015/09/07 09:06:04 jperkin Exp $ # Notes to package maintainers: # @@ -221,6 +221,7 @@ pre-configure: -f ${MAKE_FILE} depend all cd ${WRKDIR}/netpgpverify && \ ${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in && \ + ${RM} -f bzlib.h zlib.h && \ ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure && \ ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} ${MAKE_PROGRAM} \ ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} all diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in index 81cba4c77d9..7f5be93f8b3 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.30 2015/09/01 12:14:06 jperkin Exp $ +# $NetBSD: Makefile.in,v 1.31 2015/09/07 09:06:04 jperkin Exp $ srcdir= @srcdir@ @@ -20,7 +20,7 @@ LDFLAGS= @LDFLAGS@ -L../lib SSL_SUPPORT= @ssl_support@ -LIBS= -linstall -larchive -lfetch -lnetpgpverify +LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -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 8d7d0362cf2..56cb24697c4 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.28 2015/09/01 12:14:06 jperkin Exp $ +# $NetBSD: Makefile.in,v 1.29 2015/09/07 09:06:05 jperkin Exp $ srcdir= @srcdir@ @@ -28,7 +28,7 @@ PROG= pkg_admin SCRIPTS= audit-packages download-vulnerability-list .if empty(BOOTSTRAP) -LIBS= -linstall -larchive -lfetch -lnetpgpverify +LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -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 49f9ebe9a2e..fdd1f7b7b6d 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.26 2015/09/01 12:14:06 jperkin Exp $ +# $NetBSD: Makefile.in,v 1.27 2015/09/07 09:06:05 jperkin Exp $ srcdir= @srcdir@ @@ -26,7 +26,7 @@ PROG= pkg_create SSL_SUPPORT= @ssl_support@ .if empty(BOOTSTRAP) -LIBS= -linstall -larchive -lfetch -lnetpgpverify @LIBS@ +LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -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 cb79b436420..62e1f67c528 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.23 2015/09/01 12:14:06 jperkin Exp $ +# $NetBSD: Makefile.in,v 1.24 2015/09/07 09:06:05 jperkin Exp $ srcdir= @srcdir@ @@ -15,7 +15,7 @@ SSL_SUPPORT= @ssl_support@ CC= @CC@ CCLD= $(CC) -LIBS= -linstall -larchive -lfetch -lnetpgpverify @LIBS@ +LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -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 0f8b3afe8ea..7c2141bd0a3 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.29 2015/09/01 12:14:06 jperkin Exp $ +# $NetBSD: Makefile.in,v 1.30 2015/09/07 09:06:05 jperkin Exp $ srcdir= @srcdir@ @@ -17,7 +17,7 @@ SSL_SUPPORT= @ssl_support@ CC= @CC@ CCLD= $(CC) .if empty(BOOTSTRAP) -LIBS= -linstall -larchive -lfetch -lnetpgpverify @LIBS@ +LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@ .if !empty(SSL_SUPPORT) LIBS+= -lssl -lcrypto .endif |