CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan  3 17:53:14 UTC 2017

Modified Files:
        pkgsrc/bootstrap: bootstrap
        pkgsrc/pkgtools/pkg_install: Makefile

Log Message:
Pass --without-lz4 to libarchive bootstrap, avoids issues on Gentoo where
the native lz4 is found.


To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.218 -r1.219 pkgsrc/pkgtools/pkg_install/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.234 pkgsrc/bootstrap/bootstrap:1.235
--- pkgsrc/bootstrap/bootstrap:1.234    Tue Nov 15 11:19:09 2016
+++ pkgsrc/bootstrap/bootstrap  Tue Jan  3 17:53:14 2017
@@ -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@localhost>
 # All rights reserved.
@@ -1198,7 +1198,7 @@ run_cmd "(cd $wrkdir/libarchive; env $BS
 $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

Index: pkgsrc/pkgtools/pkg_install/Makefile
diff -u pkgsrc/pkgtools/pkg_install/Makefile:1.218 pkgsrc/pkgtools/pkg_install/Makefile:1.219
--- pkgsrc/pkgtools/pkg_install/Makefile:1.218  Tue Jun 21 12:23:01 2016
+++ pkgsrc/pkgtools/pkg_install/Makefile        Tue Jan  3 17:53:14 2017
@@ -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