diff options
Diffstat (limited to 'app-arch/zstd')
| -rw-r--r-- | app-arch/zstd/Manifest | 9 | ||||
| -rw-r--r-- | app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch | 67 | ||||
| -rw-r--r-- | app-arch/zstd/zstd-1.4.2.ebuild | 62 | ||||
| -rw-r--r-- | app-arch/zstd/zstd-1.4.3.ebuild | 62 | ||||
| -rw-r--r-- | app-arch/zstd/zstd-1.4.4-r2.ebuild (renamed from app-arch/zstd/zstd-1.3.8.ebuild) | 6 |
5 files changed, 75 insertions, 131 deletions
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest index ea2338b1277c..9b540e02018a 100644 --- a/app-arch/zstd/Manifest +++ b/app-arch/zstd/Manifest @@ -1,9 +1,6 @@ +AUX zstd-1.4.4-pkgconfig_fix.patch 2371 BLAKE2B 534be17dbd9886687b6d86a5bf808d674fda79492f59e1371147c1bbc2c102f98870c17bf451702edec7a7d4c01cba5ed975f0f1f03b1673ce0f108f5b6d353e SHA512 b7a9f10a878d52de87c599817e990d8dadf8fa7847ffc79c667842bf4d80c83c0a4e59d6321427aabe9ba02e93a58b1e86b49033dffb38dfba477997ad96ac59 DIST zstd-1.3.7.tar.gz 1825458 BLAKE2B 2a689289ec70fd510575aecebf88ad763bd150e578d70d9fbb1678cba314c90a60339697232a5515990505e3c889aac92c3c2c4c3fc48e0d434b4dfd6cac9df1 SHA512 b7a432b13e237ac1490cd82b87727f6a4385d5ea7b89f566dea61a3993e17909c03288f727326ada326e36eb47ea5f9eab67c097808ee42f52cc800a7f7e1738 -DIST zstd-1.3.8.tar.gz 1875233 BLAKE2B c9775b0e33e61d2c064df60a266246f6b9b65b70ba2cc529633cf700b5dcac795e13ec0e20bd51bdd02ee5fddbc7f2fc030902ee37a5a433c2d7828c285b3c23 SHA512 834f7b6477c1e7d70f71105ea52be15c33866b48b93b7a3c6dff4f10c761e5ad35f3903899516317690a4b768051f6eedf7c030292f57cea5613d4017fab9466 -DIST zstd-1.4.2.tar.gz 1909790 BLAKE2B 7b420caf91bd2e9739a26e5ea61c0c5b7d9d6d8e6630612fd66fec24203bc38ae7ab527587318c09997e1e577210b748576d8cb40a0d8dd366fafc306b28c0fa SHA512 5473502093332401c83b02e4ac66b2e05f32f710121d371daf164d8b002be9c06c51578bf9fed0ffb70bb67a0c64457b0e7a02f0d1ba5d36b1f3b6dde93ff907 -DIST zstd-1.4.3.tar.gz 1911868 BLAKE2B da4c4b4f6afc36a23a13a9582874891ad206b01dc805f9e79879cb833b47c0bb18ec1b3bb5c0b99f4e8707d21659ca0b7446a84d15f513a3fcab206bc7f49539 SHA512 ccda90c7437635f92d0db39dfba3604e256f1f08284c35c042763a54b0ead45dca8e7fa3e5cf8032292d1dd9eefc1369e23f78a80d9335d69170563090677d5f +DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf EBUILD zstd-1.3.7-r1.ebuild 1345 BLAKE2B a6162c4b43128fd005ee2ef916dbaa1b2193e5e62ac745c29a05b88b272921b8557af64cb56185d58657a9d58ad156ea9cd6ded9d2bec5938b1b749755f5278a SHA512 5209f66e534b09c1de77db8f320c8ec2878051de5a500a671d164441ec89334406c5177e18d0f0385bb734bf9052057c1d63aba461c6008811479b420f15597e -EBUILD zstd-1.3.8.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6 -EBUILD zstd-1.4.2.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6 -EBUILD zstd-1.4.3.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6 +EBUILD zstd-1.4.4-r2.ebuild 1443 BLAKE2B a3551c159df6a6aeca641aab738a796a225e4346d2f1e716508bb3244bf37120b6b16b391939a80394e1d4550d5672b79131226e58f6b21be38bbb2b6c765841 SHA512 3f39c47f535388a2c7e2c4abd7b366e6c7c2b1a26b6dac12d4f5139ad9a040b09518b7c17228d0e42487bac8ebcc077e835b5068ae1ec16447681191bed0512c MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6 diff --git a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch new file mode 100644 index 000000000000..2fab9804c139 --- /dev/null +++ b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch @@ -0,0 +1,67 @@ +From a025c46969b76a10ce1618df4dbb11a09563c413 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Wed, 20 Nov 2019 16:41:18 +0100 +Subject: [PATCH] Revert "In pkg-config File, Derive Lib and Include Dir from + Prefix at Use-Time" + +This reverts commit 74bd76c3ffb3837a3fefc055edbc347620447236. + +This breaks systems that use lib32 and/or lib64 instead of lib +See https://github.com/facebook/zstd/issues/1900 + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + build/cmake/lib/CMakeLists.txt | 3 ++- + lib/Makefile | 2 ++ + lib/libzstd.pc.in | 5 ++--- + 3 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt +index 7adca875..77b389ca 100644 +--- a/build/cmake/lib/CMakeLists.txt ++++ b/build/cmake/lib/CMakeLists.txt +@@ -134,10 +134,11 @@ if (UNIX) + # pkg-config + set(PREFIX "${CMAKE_INSTALL_PREFIX}") + set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++ set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(VERSION "${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}") + add_custom_target(libzstd.pc ALL + ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc" +- -DPREFIX="${PREFIX}" -DVERSION="${VERSION}" ++ -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}" + -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake" + COMMENT "Creating pkg-config file") + +diff --git a/lib/Makefile b/lib/Makefile +index fd1710cf..97375ad2 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -244,6 +244,8 @@ libzstd.pc: + libzstd.pc: libzstd.pc.in + @echo creating pkgconfig + @sed -e 's|@PREFIX@|$(PREFIX)|' \ ++ -e 's|@LIBDIR@|$(LIBDIR)|' \ ++ -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \ + -e 's|@VERSION@|$(VERSION)|' \ + $< >$@ + +diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in +index e7880be4..1d07b91f 100644 +--- a/lib/libzstd.pc.in ++++ b/lib/libzstd.pc.in +@@ -3,9 +3,8 @@ + # BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + + prefix=@PREFIX@ +-exec_prefix=${prefix} +-includedir=${prefix}/include +-libdir=${exec_prefix}/lib ++libdir=@LIBDIR@ ++includedir=@INCLUDEDIR@ + + Name: zstd + Description: fast lossless compression algorithm library +-- +2.24.0 + diff --git a/app-arch/zstd/zstd-1.4.2.ebuild b/app-arch/zstd/zstd-1.4.2.ebuild deleted file mode 100644 index 2704ae6a18f3..000000000000 --- a/app-arch/zstd/zstd-1.4.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs - -DESCRIPTION="zstd fast compression library" -HOMEPAGE="https://facebook.github.io/zstd/" -SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="lz4 static-libs" - -RDEPEND="app-arch/xz-utils - lz4? ( app-arch/lz4 )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - multilib_copy_sources -} - -mymake() { - emake \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - "${@}" -} - -multilib_src_compile() { - mymake -C lib libzstd libzstd.a libzstd.pc - - if multilib_is_native_abi ; then - mymake zstd - - mymake -C contrib/pzstd - fi -} - -multilib_src_install() { - mymake -C lib DESTDIR="${D}" install - - if multilib_is_native_abi ; then - mymake -C programs DESTDIR="${D}" install - - mymake -C contrib/pzstd DESTDIR="${D}" install - fi -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/app-arch/zstd/zstd-1.4.3.ebuild b/app-arch/zstd/zstd-1.4.3.ebuild deleted file mode 100644 index 2704ae6a18f3..000000000000 --- a/app-arch/zstd/zstd-1.4.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs - -DESCRIPTION="zstd fast compression library" -HOMEPAGE="https://facebook.github.io/zstd/" -SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="lz4 static-libs" - -RDEPEND="app-arch/xz-utils - lz4? ( app-arch/lz4 )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - multilib_copy_sources -} - -mymake() { - emake \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - "${@}" -} - -multilib_src_compile() { - mymake -C lib libzstd libzstd.a libzstd.pc - - if multilib_is_native_abi ; then - mymake zstd - - mymake -C contrib/pzstd - fi -} - -multilib_src_install() { - mymake -C lib DESTDIR="${D}" install - - if multilib_is_native_abi ; then - mymake -C programs DESTDIR="${D}" install - - mymake -C contrib/pzstd DESTDIR="${D}" install - fi -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/app-arch/zstd/zstd-1.3.8.ebuild b/app-arch/zstd/zstd-1.4.4-r2.ebuild index 2704ae6a18f3..4af98aeb8cd8 100644 --- a/app-arch/zstd/zstd-1.3.8.ebuild +++ b/app-arch/zstd/zstd-1.4.4-r2.ebuild @@ -18,6 +18,10 @@ RDEPEND="app-arch/xz-utils lz4? ( app-arch/lz4 )" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.4.4-pkgconfig_fix.patch" #700780 +) + src_prepare() { default multilib_copy_sources @@ -37,7 +41,7 @@ multilib_src_compile() { mymake -C lib libzstd libzstd.a libzstd.pc if multilib_is_native_abi ; then - mymake zstd + mymake HAVE_LZ4="$(usex lz4 1 0)" zstd mymake -C contrib/pzstd fi |