1 |
commit: 8587dd7a8c040c26cd234baefe517027e4fedc1f |
2 |
Author: Alex Fan <alex.fan.q <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Nov 28 11:27:17 2021 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 28 20:28:35 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8587dd7a |
7 |
|
8 |
sci-libs/superlu_mt: fix int64 not taking effect |
9 |
|
10 |
upstream uses unconventional variables names. int64 adds _LONG_INT |
11 |
to PREDEFS. PREDEFS seems to be a synonym of CPPFLAGS and used |
12 |
sparingly to be appended to CFLAGS. It should be passed to $(CC) |
13 |
explicitly for int64 to take effect. |
14 |
|
15 |
EXAMLE/Makefile should include ../make.in, which is the same in |
16 |
upstream. |
17 |
|
18 |
Signed-off-by: Alex Fan <alex.fan.q <AT> gmail.com> |
19 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
20 |
|
21 |
.../files/superlu_mt-3.1-fix-predefs.patch | 22 ++++++++++++++++++++++ |
22 |
sci-libs/superlu_mt/superlu_mt-3.1.ebuild | 3 +-- |
23 |
2 files changed, 23 insertions(+), 2 deletions(-) |
24 |
|
25 |
diff --git a/sci-libs/superlu_mt/files/superlu_mt-3.1-fix-predefs.patch b/sci-libs/superlu_mt/files/superlu_mt-3.1-fix-predefs.patch |
26 |
new file mode 100644 |
27 |
index 000000000000..95c64675a87b |
28 |
--- /dev/null |
29 |
+++ b/sci-libs/superlu_mt/files/superlu_mt-3.1-fix-predefs.patch |
30 |
@@ -0,0 +1,22 @@ |
31 |
+--- a/INSTALL/Makefile |
32 |
++++ b/INSTALL/Makefile |
33 |
+@@ -19,7 +19,7 @@ slamch.o: slamch.c ; $(CC) $(NOOPTS) -c $< |
34 |
+ dlamch.o: dlamch.c ; $(CC) $(NOOPTS) -c $< |
35 |
+ superlu_timer.o: superlu_timer.c; $(CC) $(NOOPTS) -c $< |
36 |
+ |
37 |
+-.c.o: ; $(CC) $(CFLAGS) -c $< |
38 |
++.c.o: ; $(CC) $(PREDEFS) $(CFLAGS) -c $< |
39 |
+ |
40 |
+ clean: |
41 |
+ rm -f *.o test* *.out |
42 |
+--- a/SRC/Makefile |
43 |
++++ b/SRC/Makefile |
44 |
+@@ -130,7 +130,7 @@ await.o: await.c |
45 |
+ $(CC) -c $(NOOPTS) $< $(VERBOSE) |
46 |
+ |
47 |
+ .c.o: |
48 |
+- $(CC) $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE) |
49 |
++ $(CC) ${PREDEFS} $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE) |
50 |
+ |
51 |
+ clean: |
52 |
+ rm -f *.o core ../lib/$(SUPERLULIB) |
53 |
|
54 |
diff --git a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild |
55 |
index f631900a16d9..eab8a2ad999d 100644 |
56 |
--- a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild |
57 |
+++ b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild |
58 |
@@ -61,8 +61,7 @@ src_prepare() { |
59 |
TMGLIB=libtmglib.a |
60 |
EOF |
61 |
SONAME=lib${PN}.so.${SOVERSION} |
62 |
- sed -e 's|../make.inc|make.inc|' \ |
63 |
- -e "s|../SRC|${EPREFIX}/usr/include/${PN}|" \ |
64 |
+ sed -e "s|../SRC|${EPREFIX}/usr/include/${PN}|" \ |
65 |
-e '/:.*$(SUPERLULIB)/s|../lib/$(SUPERLULIB)||g' \ |
66 |
-e 's|../lib/$(SUPERLULIB)|-lsuperlu_mt|g' \ |
67 |
-i EXAMPLE/Makefile || die |