1 |
commit: dd6ff2f5c2f7887079934c95554adf61efb62506 |
2 |
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in> |
3 |
AuthorDate: Sun May 16 13:43:18 2021 +0000 |
4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
5 |
CommitDate: Sun May 16 14:05:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd6ff2f5 |
7 |
|
8 |
sci-libs/meschach: fix CC |
9 |
|
10 |
Closes: https://bugs.gentoo.org/785196 |
11 |
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in> |
12 |
|
13 |
sci-libs/meschach/files/configure.patch | 29 +++++++++++++++++++++++++++++ |
14 |
sci-libs/meschach/meschach-1.2b.ebuild | 3 ++- |
15 |
2 files changed, 31 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/sci-libs/meschach/files/configure.patch b/sci-libs/meschach/files/configure.patch |
18 |
new file mode 100644 |
19 |
index 000000000..858196846 |
20 |
--- /dev/null |
21 |
+++ b/sci-libs/meschach/files/configure.patch |
22 |
@@ -0,0 +1,29 @@ |
23 |
+Bug: https://bugs.gentoo.org/785196 |
24 |
+ |
25 |
+--- a/configure.in |
26 |
++++ b/configure.in |
27 |
+@@ -9,16 +9,6 @@ |
28 |
+ [extern int test (int i, double x);], |
29 |
+ AC_DEFINE(HAVE_PROTOTYPES))])dnl |
30 |
+ dnl |
31 |
+-dnl Brook Milligan's compiler check |
32 |
+-dnl Check for the sun ansi c compiler, acc |
33 |
+-define(LOCAL_PROG_ACC, |
34 |
+-[AC_BEFORE([$0], [AC_PROG_CPP])AC_PROVIDE([$0])dnl |
35 |
+-AC_PROGRAM_CHECK(CC, acc, acc, "")])dnl |
36 |
+-dnl David Stewart's modified compiler check |
37 |
+-define(LOCAL_PROG_CC, |
38 |
+-[AC_BEFORE([$0], [AC_PROG_CPP])AC_PROVIDE([$0])dnl |
39 |
+-AC_PROGRAM_CHECK(CC, acc, acc, cc)])dnl |
40 |
+-dnl |
41 |
+ dnl |
42 |
+ dnl |
43 |
+ dnl ---------------------------------------------------------------------- |
44 |
+@@ -29,7 +19,6 @@ |
45 |
+ PROGS="" |
46 |
+ AC_SUBST(PROGS)dnl |
47 |
+ LOCAL_PROG_ACC |
48 |
+-AC_PROGRAM_CHECK(CC, cc, cc, gcc) |
49 |
+ dnl AC_PROG_CC |
50 |
+ AC_PROG_CPP |
51 |
+ AC_AIX |
52 |
|
53 |
diff --git a/sci-libs/meschach/meschach-1.2b.ebuild b/sci-libs/meschach/meschach-1.2b.ebuild |
54 |
index 2f534ad10..b1f5b41bd 100644 |
55 |
--- a/sci-libs/meschach/meschach-1.2b.ebuild |
56 |
+++ b/sci-libs/meschach/meschach-1.2b.ebuild |
57 |
@@ -27,13 +27,14 @@ PATCHES=( |
58 |
"${WORKDIR}/debian/patches/${PN}_${PV}-13.diff" |
59 |
"${WORKDIR}/debian/patches/${PN}_${PV}-13.configure.diff" |
60 |
"${FILESDIR}/makefile.patch" |
61 |
+ "${FILESDIR}/configure.patch" |
62 |
) |
63 |
|
64 |
src_prepare() { |
65 |
default |
66 |
use old && sed -i -- 's/all: shared static/all: oldpart shared static/g' makefile.in |
67 |
mv configure.in configure.ac || die |
68 |
- export AR="$(tc-getAR)" |
69 |
+ tc-export AR CC |
70 |
eautoreconf |
71 |
} |