Gentoo Archives: gentoo-commits

From: "Maciej Barć" <xgqt@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cadical/, sci-mathematics/cadical/files/
Date: Tue, 28 Dec 2021 17:45:09
Message-Id: 1640713499.130afa266034cea03e902458a9dd42deaf0e23a6.xgqt@gentoo
1 commit: 130afa266034cea03e902458a9dd42deaf0e23a6
2 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 28 17:13:58 2021 +0000
4 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 28 17:44:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130afa26
7
8 sci-mathematics/cadical: patch direct call to ar
9
10 Closes: https://bugs.gentoo.org/830175
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
13
14 .../{cadical-1.5.2.ebuild => cadical-1.5.2-r1.ebuild} | 3 +++
15 sci-mathematics/cadical/files/cadical-makefile.in-ar.patch | 12 ++++++++++++
16 2 files changed, 15 insertions(+)
17
18 diff --git a/sci-mathematics/cadical/cadical-1.5.2.ebuild b/sci-mathematics/cadical/cadical-1.5.2-r1.ebuild
19 similarity index 90%
20 rename from sci-mathematics/cadical/cadical-1.5.2.ebuild
21 rename to sci-mathematics/cadical/cadical-1.5.2-r1.ebuild
22 index d79ad9ed0845..c773ea12d5f2 100644
23 --- a/sci-mathematics/cadical/cadical-1.5.2.ebuild
24 +++ b/sci-mathematics/cadical/cadical-1.5.2-r1.ebuild
25 @@ -14,9 +14,12 @@ LICENSE="MIT"
26 SLOT="0/${PV}"
27 KEYWORDS="~amd64 ~x86"
28
29 +PATCHES=( "${FILESDIR}"/${PN}-makefile.in-ar.patch )
30 +
31 DOCS=( BUILD.md CONTRIBUTING NEWS.md README.md VERSION )
32
33 src_configure() {
34 + tc-export AR
35 CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" ./configure || die
36 }
37
38
39 diff --git a/sci-mathematics/cadical/files/cadical-makefile.in-ar.patch b/sci-mathematics/cadical/files/cadical-makefile.in-ar.patch
40 new file mode 100644
41 index 000000000000..cb344eec60ab
42 --- /dev/null
43 +++ b/sci-mathematics/cadical/files/cadical-makefile.in-ar.patch
44 @@ -0,0 +1,12 @@
45 +index 8fd957f..cdad96e 100644
46 +--- a/makefile.in
47 ++++ b/makefile.in
48 +@@ -47,7 +48,7 @@ mobical: mobical.o libcadical.a makefile $(LIBS)
49 + $(COMPILE) -o $@ $< -L. -lcadical
50 +
51 + libcadical.a: $(OBJ) makefile
52 +- ar rc $@ $(OBJ)
53 ++ ${AR} rc $@ $(OBJ)
54 +
55 + #--------------------------------------------------------------------------#
56 +