pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Pass --without-lz4 to libarchive bootstrap, avoids iss...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eaf9c892cec1
branches:  trunk
changeset: 356678:eaf9c892cec1
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jan 03 17:53:14 2017 +0000

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

diffstat:

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

diffs (41 lines):

diff -r 118c570183cb -r eaf9c892cec1 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Tue Jan 03 17:48:52 2017 +0000
+++ b/bootstrap/bootstrap       Tue Jan 03 17:53:14 2017 +0000
@@ -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 @@
 $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 -r 118c570183cb -r eaf9c892cec1 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Tue Jan 03 17:48:52 2017 +0000
+++ b/pkgtools/pkg_install/Makefile     Tue Jan 03 17:53:14 2017 +0000
@@ -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 @@
                ${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



Home | Main Index | Thread Index | Old Index