commit: e7190087b79b1685765ab683bf3ad23edb229950 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Tue Jul 26 17:47:44 2016 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Tue Jul 26 17:56:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7190087
app-arch/libarchive: Add explicit dep on xz threads=, backport detecction Package-Manager: portage-2.2.28 ...ibarchive-3.2.1-xz-utils-thread-detection.patch | 27 +++++ app-arch/libarchive/libarchive-3.2.1-r4.ebuild | 126 +++++++++++++++++++++ 2 files changed, 153 insertions(+) diff --git a/app-arch/libarchive/files/libarchive-3.2.1-xz-utils-thread-detection.patch b/app-arch/libarchive/files/libarchive-3.2.1-xz-utils-thread-detection.patch new file mode 100644 index 0000000..dda2359 --- /dev/null +++ b/app-arch/libarchive/files/libarchive-3.2.1-xz-utils-thread-detection.patch @@ -0,0 +1,27 @@ +From 7c3148ec0a2fed4834c6f9869ff7d2da77ba804c Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger <[email protected]> +Date: Wed, 22 Jun 2016 23:03:43 +0200 +Subject: [PATCH] Ignore the MT encoder in XZ 5.2 prerelease versions. + +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 64775fa..4f7f432 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -374,8 +374,11 @@ if test "x$with_lzma" != "xno"; then + AC_CACHE_CHECK( + [whether we have multithread support in lzma], + ac_cv_lzma_has_mt, +- [AC_COMPILE_IFELSE([ +- AC_LANG_PROGRAM([[#include <lzma.h>]], ++ [AC_LINK_IFELSE([ ++ AC_LANG_PROGRAM([[#include <lzma.h>] ++ [#if LZMA_VERSION < 50020000] ++ [#error unsupported] ++ [#endif]], + [[lzma_stream_encoder_mt(0, 0);]])], + [ac_cv_lzma_has_mt=yes], [ac_cv_lzma_has_mt=no])]) + if test "x$ac_cv_lzma_has_mt" != xno; then diff --git a/app-arch/libarchive/libarchive-3.2.1-r4.ebuild b/app-arch/libarchive/libarchive-3.2.1-r4.ebuild new file mode 100644 index 0000000..0ef480c --- /dev/null +++ b/app-arch/libarchive/libarchive-3.2.1-r4.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools eutils multilib-minimal toolchain-funcs + +DESCRIPTION="BSD tar command" +HOMEPAGE="http://www.libarchive.org/"; +SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"; + +LICENSE="BSD BSD-2 BSD-4 public-domain" +SLOT="0/13" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib" + +RDEPEND=" + acl? ( virtual/acl[${MULTILIB_USEDEP}] ) + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) + !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + kernel_linux? ( + xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + ) + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) + lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) + nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + kernel_linux? ( + virtual/os-headers + e2fsprogs? ( sys-fs/e2fsprogs ) + )" + +PATCHES=( + "${FILESDIR}/${P}-fix-tests-gnu99.patch" + "${FILESDIR}/${P}-osx-fix-acl.patch" #587890 + "${FILESDIR}/${P}-xz-utils-thread-detection.patch" #589654 +) + +src_prepare() { + default + eautoreconf # elibtoolize is required for Solaris sol2_ld linker fix +} + +multilib_src_configure() { + export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 + + local myconf=() + myconf=( + $(use_enable acl) + $(use_enable static-libs static) + $(use_enable xattr) + $(use_with bzip2 bz2lib) + $(use_with expat) + $(use_with !expat xml2) + $(use_with iconv) + $(use_with lz4) + $(use_with lzma) + $(use_with lzo lzo2) + $(use_with nettle) + $(use_with zlib) + ) + if multilib_is_native_abi ; then myconf+=( + --enable-bsdcat=$(tc-is-static-only && echo static || echo shared) + --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) + --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) + ); else myconf+=( + --disable-bsdcat + --disable-bsdcpio + --disable-bsdtar + ); fi + + # We disable lzmadec because we support the newer liblzma from xz-utils + # and not liblzmadec with this version. + myconf+=( + --without-lzmadec + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi ; then + emake + else + emake libarchive.la + fi +} + +multilib_src_test() { + # Replace the default src_test so that it builds tests in parallel + multilib_is_native_abi && emake check +} + +multilib_src_install() { + if multilib_is_native_abi ; then + emake DESTDIR="${D}" install + + # Create symlinks for FreeBSD + if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then + for bin in cat cpio tar; do + dosym bsd${bin} /usr/bin/${bin} + echo '.so bsd${bin}.1' > "${T}"/${bin}.1 + doman "${T}"/${bin}.1 + done + fi + else + emake DESTDIR="${D}" \ + install-includeHEADERS \ + install-libLTLIBRARIES \ + install-pkgconfigDATA + fi + + # Libs.private: should be used from libarchive.pc instead + prune_libtool_files +} + +multilib_src_install_all() { + cd "${S}" || die + einstalldocs +}
