[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cadical/, sci-mathematics/cadical/files/

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cadical/, sci-mathematics/cadical/files/

[Maciej Barć]

commit:     130afa266034cea03e902458a9dd42deaf0e23a6
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 17:13:58 2021 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 17:44:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130afa26

sci-mathematics/cadical: patch direct call to ar

Closes: https://bugs.gentoo.org/830175
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../{cadical-1.5.2.ebuild => cadical-1.5.2-r1.ebuild}        |  3 +++
 sci-mathematics/cadical/files/cadical-makefile.in-ar.patch   | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/sci-mathematics/cadical/cadical-1.5.2.ebuild b/sci-mathematics/cadical/cadical-1.5.2-r1.ebuild
similarity index 90%
rename from sci-mathematics/cadical/cadical-1.5.2.ebuild
rename to sci-mathematics/cadical/cadical-1.5.2-r1.ebuild
index d79ad9ed0845..c773ea12d5f2 100644
--- a/sci-mathematics/cadical/cadical-1.5.2.ebuild
+++ b/sci-mathematics/cadical/cadical-1.5.2-r1.ebuild
@@ -14,9 +14,12 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=( "${FILESDIR}"/${PN}-makefile.in-ar.patch )
+
 DOCS=( BUILD.md CONTRIBUTING NEWS.md README.md VERSION )
 
 src_configure() {
+	tc-export AR
 	CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" ./configure || die
 }
 

diff --git a/sci-mathematics/cadical/files/cadical-makefile.in-ar.patch b/sci-mathematics/cadical/files/cadical-makefile.in-ar.patch
new file mode 100644
index 000000000000..cb344eec60ab
--- /dev/null
+++ b/sci-mathematics/cadical/files/cadical-makefile.in-ar.patch
@@ -0,0 +1,12 @@
+index 8fd957f..cdad96e 100644
+--- a/makefile.in
++++ b/makefile.in
+@@ -47,7 +48,7 @@ mobical: mobical.o libcadical.a makefile $(LIBS)
+ 	$(COMPILE) -o $@ $< -L. -lcadical
+ 
+ libcadical.a: $(OBJ) makefile
+-	ar rc $@ $(OBJ)
++	${AR} rc $@ $(OBJ)
+ 
+ #--------------------------------------------------------------------------#
+