Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/djbfft/, sci-libs/djbfft/files/
Date: Thu, 07 Oct 2021 09:17:16
Message-Id: 1633596962.a4ac94e6a29b969e5fe1681cf38e88084650621a.jsmolic@gentoo
1 commit: a4ac94e6a29b969e5fe1681cf38e88084650621a
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 7 08:56:02 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 7 08:56:02 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ac94e6
7
8 sci-libs/djbfft: Fix tc-directly
9
10 Closes: https://bugs.gentoo.org/731874
11 Closes: https://bugs.gentoo.org/725432
12 Closes: https://bugs.gentoo.org/721352
13 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
14
15 sci-libs/djbfft/djbfft-0.76-r3.ebuild | 2 ++
16 .../djbfft/files/djbfft-0.76-tc-directly.patch | 22 ++++++++++++++++++++++
17 2 files changed, 24 insertions(+)
18
19 diff --git a/sci-libs/djbfft/djbfft-0.76-r3.ebuild b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
20 index a0dcc7e2d8f..eee460123e6 100644
21 --- a/sci-libs/djbfft/djbfft-0.76-r3.ebuild
22 +++ b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
23 @@ -17,6 +17,7 @@ PATCHES=(
24 "${FILESDIR}"/${P}-gcc3.patch
25 "${FILESDIR}"/${P}-shared.patch
26 "${FILESDIR}"/${P}-headers.patch
27 + "${FILESDIR}"/${P}-tc-directly.patch
28 )
29
30 DOCS=( CHANGES README TODO VERSION )
31 @@ -35,6 +36,7 @@ src_prepare() {
32 }
33
34 multilib_src_configure() {
35 + tc-export AR RANLIB
36 [[ ${ABI} == x86* ]] && append-cflags -malign-double
37
38 sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c || die
39
40 diff --git a/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch b/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch
41 new file mode 100644
42 index 00000000000..340d3b7be6a
43 --- /dev/null
44 +++ b/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch
45 @@ -0,0 +1,22 @@
46 +# https://bugs.gentoo.org/731874
47 +# https://bugs.gentoo.org/725432
48 +--- a/Makefile
49 ++++ b/Makefile
50 +@@ -736,7 +736,7 @@ warn-auto.sh systype
51 + echo 'rm -f "$$main"'; \
52 + echo 'if [ "$${main##*.}" = "a" ]'; \
53 + echo 'then'; \
54 +- echo ' ar cr "$$main" $${1+"$$@"}'; \
55 ++ echo ' $(AR) cr "$$main" $${1+"$$@"}'; \
56 + case "`cat systype`" in \
57 + sunos-5.*) ;; \
58 + unix_sv*) ;; \
59 +@@ -745,7 +745,7 @@ warn-auto.sh systype
60 + dgux-*) ;; \
61 + hp-ux-*) ;; \
62 + sco*) ;; \
63 +- *) echo ' ranlib "$$main"' ;; \
64 ++ *) echo ' $(RANLIB) "$$main"' ;; \
65 + esac; \
66 + echo 'else'; \
67 + echo ' exec `head -1 conf-ld` -shared -Wl,-soname,libdjbfft.so.0.7.6 -o "$$main" $${1+"$$@"}'; \