From 0eda257957d169d980a38506e38a8d4f4266b023 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Tue, 3 Jan 2017 17:53:14 +0000
Subject: Pass --without-lz4 to libarchive bootstrap, avoids issues on Gentoo
 where the native lz4 is found.

---
 bootstrap/bootstrap           | 4 ++--
 pkgtools/pkg_install/Makefile | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 72f95432f5b..2ce8ff9dff6 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.234 2016/11/15 11:19:09 jperkin Exp $
+# $NetBSD: bootstrap,v 1.235 2017/01/03 17:53:14 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
@@ -1198,7 +1198,7 @@ run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV \
 $shprog ./configure $configure_quiet_flags --enable-static --disable-shared \
 --disable-bsdtar --disable-bsdcpio --disable-posix-regex-lib --disable-xattr \
 --disable-maintainer-mode --disable-acl --without-zlib --without-bz2lib \
---without-lzmadec --without-iconv --without-lzma --without-lzo2 \
+--without-lzmadec --without-iconv --without-lzma --without-lzo2 --without-lz4 \
 --without-nettle --without-openssl --without-xml2 --without-expat \
 MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)"
 copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 53a4834fd54..02aab8921f8 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218 2016/06/21 12:23:01 joerg Exp $
+# $NetBSD: Makefile,v 1.219 2017/01/03 17:53:14 jperkin Exp $
 
 # Notes to package maintainers:
 #
@@ -213,9 +213,9 @@ pre-configure:
 		${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure	\
 		--disable-bsdcpio --disable-bsdtar --disable-shared	\
 		--disable-dependency-tracking --without-expat		\
-		--disable-maintainer-mode \
+		--disable-maintainer-mode				\
 		--without-iconv --without-lzo2 --without-nettle		\
-		--without-xml2	\
+		--without-xml2 --without-lz4				\
 		${LIBARCHIVE_CONFIGURE_ARGS}
 	cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD}
 .endif
-- 
cgit v1.2.3