From 88e6368ac393fb69b358b60fcedf125f4724172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 Jan 2024 17:48:50 +0000 Subject: gentoo auto-resync : 31:01:2024 - 17:48:49 --- dev-libs/isa-l/Manifest | 2 +- dev-libs/isa-l/isa-l-2.30.0-r1.ebuild | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 10 deletions(-) (limited to 'dev-libs/isa-l') diff --git a/dev-libs/isa-l/Manifest b/dev-libs/isa-l/Manifest index 4b6071b01cdc..087f19515493 100644 --- a/dev-libs/isa-l/Manifest +++ b/dev-libs/isa-l/Manifest @@ -1,5 +1,5 @@ AUX isa-l-2.30.0_makefile-no-D.patch 511 BLAKE2B 64e65daf876cde7a5ca4ba8f8f4e308d9a24eb07449e5728250bf88871ea01b62384c74d92f77ca8ea8c47909a389e9add2741ee053ad7be4d0dbf423e2b965c SHA512 5465bf937401a15bf2e3ed8274d1f2ae45428c29739e835d71474d81bfae78b83cd38c762bcbb25fbe62853c979bdfd5e56bce4f0cd43a949c2b61141feb7415 AUX isa-l-2.30.0_makefile-x86.patch 223 BLAKE2B ddbe4532bcff110c10d79791e2e8378ed03b6cabc2ec5b86e4f82718b07f09757d0ed903b7e6b412f11504d3beb9c4263b47a1d29243978c277470f1f3272290 SHA512 36da90bb9ac7031485ef18b8a082a682aeb0addb16f71fe864c3f8e16c48f19fedbed30b2acfb1e84bb983305f146866aaf61a38f65ae9d5a28f6a491eaf1b3e DIST isa-l-2.30.0.tar.gz 649389 BLAKE2B 3364733d61ce16c91891b6da63d2b4fb2bc004761c91f2076a9a6441adaea24af43b6d32caec011c06206e3811e8c9639f8ceaac89fe97800144c7f78c80c350 SHA512 d3ecfb7326097534b06a74b584100336509525ae7cadc6112d0c27e3d8704f3810e18f583d3cc33fa266bfec96db023607622b22ddbf17988ec4bf1bb3b3b9b2 -EBUILD isa-l-2.30.0-r1.ebuild 977 BLAKE2B ec6702b42dbd01c655601ffcf15b3023763df7c883e1ec08b12ca2bb2f9579c96412cffda46e043904f955d760d71531020e1e6035c679405ca471486bc4c666 SHA512 62d2f099ead996e8b3bf1b4ac2d199fbc0f7711090f1eb823c5e8b02fcc18d9783c5135432e0e5101ca6db5cd44e112906ef7856254be9e865a4bcb3ec39daf7 +EBUILD isa-l-2.30.0-r1.ebuild 1148 BLAKE2B 038ca969c54073a73ce85bed785f9478d83f21a96ca28529a431bb891181653960c576210e7c1acd176543f9e33bcf79ec3c73765fc78dd2d57fbb5f8f99c8f4 SHA512 970ae92ee15772623b7177d694ca355db209ca84db91b4f2dc410ea33cebaabd8d8f95db9992770d38d90856035f9a517761d62e3745399709164e1359f04d14 MISC metadata.xml 1002 BLAKE2B 2934e906f4d5a6afd5de680fefc934d46f8730fba062834b0d63ca58b0c7cab684daea9c3adafd8e00e44efa7fa09547f8602b724b5cebb557d4ffff1eaf4615 SHA512 6cbf77704f202e8748348b3ee95295ab7d3def3ddf07ede18f4dafdc4374685b7597892d2ba02eaf2d113abeb6f6ece282f8f822528eecd6871c7c0faedcce28 diff --git a/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild index 5998011ab3dd..6cb8319addff 100644 --- a/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild +++ b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild @@ -15,13 +15,22 @@ KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" IUSE="cpu_flags_x86_avx512f" # AVX512 support in yasm is still work in progress -BDEPEND="amd64? ( - cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 ) - !cpu_flags_x86_avx512f? ( || ( - >=dev-lang/nasm-2.11.01 - >=dev-lang/yasm-1.2.0 - ) ) -)" +BDEPEND=" + amd64? ( + cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 ) + !cpu_flags_x86_avx512f? ( || ( + >=dev-lang/nasm-2.11.01 + >=dev-lang/yasm-1.2.0 + ) ) + ) + x86? ( + cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 ) + !cpu_flags_x86_avx512f? ( || ( + >=dev-lang/nasm-2.11.01 + >=dev-lang/yasm-1.2.0 + ) ) + ) +" PATCHES=( "${FILESDIR}"/${PN}-2.30.0_makefile-no-D.patch @@ -31,9 +40,11 @@ PATCHES=( src_prepare() { default - # isa-l does not support arbitrary assemblers on amd64 (and presumably x86), + # isa-l does not support arbitrary assemblers on amd64 and x86, # it must be either nasm or yasm. - use amd64 && unset AS + if use amd64 || use x86; then + unset AS + fi eautoreconf } -- cgit v1.2.3