diff options
| author | jperkin <jperkin> | 2016-01-27 12:26:11 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-01-27 12:26:11 +0000 |
| commit | e3f776d8d3acdf248282ccf2ddbf9f761423163f (patch) | |
| tree | 946d9cd282c0cc7051692031a9db3f35a1545c85 /archivers | |
| parent | 1fc6b389edb1c27d4a19dc3330c44e2d1408f75d (diff) | |
| download | pkgsrc-e3f776d8d3acdf248282ccf2ddbf9f761423163f.tar.gz | |
Ensure lzma support is explicitly disabled when not using builtin xz.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/bsdtar/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/archivers/bsdtar/Makefile b/archivers/bsdtar/Makefile index c8b81daf1c6..bdd9cd998ac 100644 --- a/archivers/bsdtar/Makefile +++ b/archivers/bsdtar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2015/01/17 12:44:51 adam Exp $ +# $NetBSD: Makefile,v 1.23 2016/01/27 12:26:11 jperkin Exp $ .include "../../archivers/libarchive/Makefile.common" @@ -13,6 +13,7 @@ CONFIGURE_ARGS+= --disable-bsdcpio CONFIGURE_ARGS+= --disable-shared .include "../../archivers/bzip2/builtin.mk" +.include "../../archivers/xz/builtin.mk" .include "../../devel/zlib/builtin.mk" CHECK_BUILTIN.openssl:= yes .include "../../security/openssl/builtin.mk" @@ -29,6 +30,9 @@ LDFLAGS+= -L${WRKDIR}/zlib .if empty(USE_BUILTIN.openssl:M[yY][eE][sS]) CONFIGURE_ARGS+= --without-openssl .endif +.if empty(USE_BUILTIN.xz:M[yY][eE][sS]) +CONFIGURE_ARGS+= --without-lzma +.endif FILESDIR.bzip2?= ${.CURDIR}/../../archivers/bzip2/files FILESDIR.libarchive?= ${.CURDIR}/../../archivers/libarchive/files |