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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 3 |
1 files changed, 1 insertions, 2 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} |