summaryrefslogtreecommitdiff
path: root/app-arch/zstd
diff options
context:
space:
mode:
Diffstat (limited to 'app-arch/zstd')
-rw-r--r--app-arch/zstd/Manifest6
-rw-r--r--app-arch/zstd/zstd-1.5.5-r1.ebuild2
-rw-r--r--app-arch/zstd/zstd-1.5.5.ebuild2
-rw-r--r--app-arch/zstd/zstd-1.5.6.ebuild16
4 files changed, 19 insertions, 7 deletions
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 953898bd9af7..ae8c6834e555 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,7 +1,7 @@
AUX zstd-1.5.4-no-find-valgrind.patch 596 BLAKE2B 28c5bcc005511703833fc73b2f11ee7a42a69c5e762e71c269265c42585fe4cf167a4bdba4f0e36e8e0e7a61e01e0f992c9417690bc879978d575823aa5e1884 SHA512 ad6cd84fde1a4f29710ecffe40854a8bbad0b1428000a57d706b221411675e2d79958c940dc955ec27020cfb7c9a14b7ac84cfe15759a5d07552d46f94b7df88
DIST zstd-1.5.5.tar.gz 2368543 BLAKE2B 7680e27a0adacfb809d9fc81e06d3f99bf74df30374d3b5cb2d58f667dd1b7d5c41697e608592709e17c0e32277f20a6d615edee409b5d7cdcb15da2799a2350 SHA512 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6
DIST zstd-1.5.6.tar.gz 2406875 BLAKE2B fe17cf0950f8ee2cc07bfa2b41e97f36a1832e396386cb94a55bede975dc974920578cf147b39eecbc5b53ff06fe0dc1fe781a4cab9bc9f767ea28c0e786422e SHA512 54a578f2484da0520a6e9a24f501b9540a3fe3806785d6bc9db79fc095b7c142a7c121387c7eecd460ca71446603584ef1ba4d29a33ca90873338c9ffbd04f14
-EBUILD zstd-1.5.5-r1.ebuild 1639 BLAKE2B e66c6d7676200ec12fcbabf9efefe5049d7ea6af8a24b2f6d114e9ff44a8e9ec2412ec6068e5dc5eb692f28237f814262cc3c83c3209ad7daff8ced612a8cfd5 SHA512 d54b99bd51bd2e782c358670d2944bceace850071ad5be4febb9750963f5130a6e30cae4c81de2d050a72b133d0b038d17312af4fba162f319995b102c54fd3e
-EBUILD zstd-1.5.5.ebuild 1752 BLAKE2B 924a18dc1a55ef5cf84e6be528328a96026074420e53ed58de0e2cf28edb479f6d2d046d79667719f70d18f6352216d7235ec0cb2f39ee2ec14b5649dd95ba07 SHA512 15acfd70664a12cdac98695b71e1c8a77bb6ae04c938a4ac6b443886793d977d27742337f0a017fdac8b68811fe2c1d93884df3c2387b5045bbc20f6a70f7b98
-EBUILD zstd-1.5.6.ebuild 1640 BLAKE2B 7634effdd8478e3ad2c8899e27c8feb148bcee5eff88a76c93152e5a34a2570a762279f98f19e3baac139fb6eee6abfde2c865da6c85c33079fb91894039e32f SHA512 5ca6b99651d9f593617b7ee647abe0794d22801c5b5259f7db0a6fcd2443f6cbf74fa633c337fd7c484f250dd170dd21034e0e89da76a5ae07dad09ce10491d4
+EBUILD zstd-1.5.5-r1.ebuild 1633 BLAKE2B 95d1deef4ee44d393f712f01a76307e0deda25dfa21aeb0644fe137614276bfcfade8511eaedeb5383c65a8aed16cff7335c87dce52e92c95ae7ce4eb9b86ce2 SHA512 9b889e06acf9dbb8b3998b058c8a835a54ffe41770112c8e3cefea4bf885cb118552135163096850183e04faa79b29991d8ab8afd0462990821ea45ba1ba76e4
+EBUILD zstd-1.5.5.ebuild 1746 BLAKE2B 2c06a19b3307d2b1300b8f8f3c60867a9c6d34d2fbb6fcf5463542d1b04f74afbd33b72b78d1d98b84b4377f8ee6184c3cedd9e4a593d4e6bf625fd575478173 SHA512 372bf15f2f134605c019b93206f758ad65df0cf20bd95f6cf7a7eced372771bcfcd44e72a11b9dfe7ba5d0a992c0b7f091a40c767ec7e7023103b2f7ea50394c
+EBUILD zstd-1.5.6.ebuild 2205 BLAKE2B 33feb555f8b95ad7244e6b51c4418108f28bc596ba655fbbf1c66c9e7e19f4e4fb43719308f25fd107dc336160b245f75b57f91e10d4ea0f01cfda544c9d27ab SHA512 6e8b6905e5e9e7dc1f15a0d25d1cdb1f429f1bc0f440f10db7f0a4b234baf675a521dbcb1332ae359c76c7b7595c5339037b86d2717188b7f2c4ef79d07fa800
MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6
diff --git a/app-arch/zstd/zstd-1.5.5-r1.ebuild b/app-arch/zstd/zstd-1.5.5-r1.ebuild
index 6e1089f54f9e..7045add23558 100644
--- a/app-arch/zstd/zstd-1.5.5-r1.ebuild
+++ b/app-arch/zstd/zstd-1.5.5-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson
LICENSE="|| ( BSD GPL-2 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="+lzma lz4 static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/app-arch/zstd/zstd-1.5.5.ebuild b/app-arch/zstd/zstd-1.5.5.ebuild
index b954dd49e2c4..66c41519a845 100644
--- a/app-arch/zstd/zstd-1.5.5.ebuild
+++ b/app-arch/zstd/zstd-1.5.5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson
LICENSE="|| ( BSD GPL-2 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="+lzma lz4 static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/app-arch/zstd/zstd-1.5.6.ebuild b/app-arch/zstd/zstd-1.5.6.ebuild
index 1bf79388c9dc..a2c7a56db95a 100644
--- a/app-arch/zstd/zstd-1.5.6.ebuild
+++ b/app-arch/zstd/zstd-1.5.6.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson-multilib
+inherit flag-o-matic meson-multilib
DESCRIPTION="zstd fast compression library"
HOMEPAGE="https://facebook.github.io/zstd/"
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson
LICENSE="|| ( BSD GPL-2 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="+lzma lz4 static-libs test zlib"
RESTRICT="!test? ( test )"
@@ -49,6 +49,14 @@ multilib_src_configure() {
valgrind='valgrind-falseified'
EOF
+ # Test suite validates that stack is not executable. Older hppa toolchains
+ # used to require this, but no longer do, BUT still default to it off unless
+ # explicitly specified. See #903923
+ # The cmake build sets these, but the meson build doesn't, so set it manually.
+ # https://github.com/facebook/zstd/blob/979b047/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake#L77-L82
+ append-flags $(test-flags-CCLD "-Wa,--noexecstack")
+ append-ldflags $(test-flags-CCLD "-Wl,-z,noexecstack")
+
local emesonargs=(
-Ddefault_library=$(multilib_native_usex static-libs both shared)
@@ -65,3 +73,7 @@ multilib_src_configure() {
meson_src_configure
}
+
+multilib_src_test() {
+ meson_src_test --timeout-multiplier=2
+}