commit:     4d19e0936eca54b068998d96d5c60eb04b0abe5d
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 11:59:36 2024 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 12:04:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d19e093

dev-libs/isa-l: add workaround for x86 build errors

x86-specific optimisations are presently broken - they call assembly
instructions which do not in fact work in 32-bit mode. Until upstream
has either fixed them or declared end of support for this arch, fall
back to the generic code.

Closes: https://bugs.gentoo.org/922193
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-libs/isa-l/files/isa-l-2.30.0_makefile-x86.patch | 12 ++++++++++++
 dev-libs/isa-l/isa-l-2.30.0-r1.ebuild                |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-libs/isa-l/files/isa-l-2.30.0_makefile-x86.patch 
b/dev-libs/isa-l/files/isa-l-2.30.0_makefile-x86.patch
new file mode 100644
index 000000000000..34b60337fe8f
--- /dev/null
+++ b/dev-libs/isa-l/files/isa-l-2.30.0_makefile-x86.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -64,8 +64,7 @@
+ endif
+ 
+ if CPU_X86_32
+-libisal_la_SOURCES += ${lsrc_x86_32}
+-other_tests += ${other_tests_x86_32}
++libisal_la_SOURCES += ${lsrc_base_aliases}
+ endif
+ 
+ if CPU_AARCH64

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 5d8fbc1d2c4b..5998011ab3dd 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ BDEPEND="amd64? (
 
 PATCHES=(
        "${FILESDIR}"/${PN}-2.30.0_makefile-no-D.patch
+       "${FILESDIR}"/${PN}-2.30.0_makefile-x86.patch
 )
 
 src_prepare() {

Reply via email to