summaryrefslogtreecommitdiff
path: root/app-arch/zstd
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-06-02 00:07:23 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-06-02 00:07:23 +0100
commit6657c680376cedf378fcf328e5fa03ed3b41d580 (patch)
tree44ea8d174f647daca562b9bdcbcb527a85a77d0a /app-arch/zstd
parent1551fe56fd6ba43a94509cffc61b6bf854b7ac9f (diff)
gentoo auto-resync : 02:06:2024 - 00:07:23
Diffstat (limited to 'app-arch/zstd')
-rw-r--r--app-arch/zstd/Manifest2
-rw-r--r--app-arch/zstd/zstd-1.5.6.ebuild16
2 files changed, 15 insertions, 3 deletions
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 953898bd9af7..be66ca1a101b 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -3,5 +3,5 @@ DIST zstd-1.5.5.tar.gz 2368543 BLAKE2B 7680e27a0adacfb809d9fc81e06d3f99bf74df303
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.6.ebuild 2201 BLAKE2B bf8d23a27166a7bee690fae56037924c2cb9617d065e6d8379e2f1da3a9f32cb782df38c9bddf9dfb6c89915cb4c91fa854b06d4a699a8fb319e49284cbfe2c7 SHA512 e59a5fdb8d7d6681db0c8653024b8e62f5ef1c1b392e41cca251bde5e6fb223f5dbbb01b7cf016333a523d45e9f23ce6d468e0d1972021e11ba16e81f11218af
MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6
diff --git a/app-arch/zstd/zstd-1.5.6.ebuild b/app-arch/zstd/zstd-1.5.6.ebuild
index 1bf79388c9dc..8197ff6bba36 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 ~ia64 ~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 "-Wa,--noexecstack")
+ append-ldflags $(test-flags "-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
+}