| 1 |
commit: 60c4e1235300e9bba9f1d86512a09257f60fe640 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 8 04:39:02 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 8 04:41:10 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c4e123 |
| 7 |
|
| 8 |
sci-visualization/opendx: fix build with slibtool, gcc 11 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/786627 |
| 11 |
Closes: https://bugs.gentoo.org/779160 |
| 12 |
Thanks-to: orbea <orbea <AT> riseup.net> |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../opendx/files/opendx-4.4.4-slibtool.patch | 40 ++++++++++++++++++++++ |
| 16 |
sci-visualization/opendx/opendx-4.4.4-r7.ebuild | 6 +++- |
| 17 |
2 files changed, 45 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-slibtool.patch b/sci-visualization/opendx/files/opendx-4.4.4-slibtool.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..964322aab9c |
| 22 |
--- /dev/null |
| 23 |
+++ b/sci-visualization/opendx/files/opendx-4.4.4-slibtool.patch |
| 24 |
@@ -0,0 +1,40 @@ |
| 25 |
+https://bugs.gentoo.org/779160 |
| 26 |
+ |
| 27 |
+commit 980149800b1bc9310c404dcc822d35bd725e8b3c |
| 28 |
+Author: orbea <orbea@××××××.net> |
| 29 |
+Date: Wed Apr 7 11:42:21 2021 -0700 |
| 30 |
+ |
| 31 |
+ build: Fix undefined references with slibtool. |
| 32 |
+ |
| 33 |
+diff --git a/src/exec/dpexec/Makefile.am b/src/exec/dpexec/Makefile.am |
| 34 |
+index 9f37d05..bd8aefe 100644 |
| 35 |
+--- a/src/exec/dpexec/Makefile.am |
| 36 |
++++ b/src/exec/dpexec/Makefile.am |
| 37 |
+@@ -33,6 +33,8 @@ libDPEXECclm_la_SOURCES = \ |
| 38 |
+ crc.c d.c exobject.c function.c license.c loader.c macro.c \ |
| 39 |
+ dpparse.c userinter.c utils.c optarg.c sfile.c ddx.c |
| 40 |
+ |
| 41 |
++libDPEXEC_la_LIBADD = ../dxmods/libuser.la |
| 42 |
++ |
| 43 |
+ EXTRA_DIST = local.mk dxThreadMain.cpp dxThreadMain.h tmainUtil.cpp tmainUtil.h |
| 44 |
+ |
| 45 |
+ $(OBJECTS): yuiif.c yuiif.h |
| 46 |
+diff --git a/src/exec/dxexec/Makefile.am b/src/exec/dxexec/Makefile.am |
| 47 |
+index 9bc4260..1971965 100644 |
| 48 |
+--- a/src/exec/dxexec/Makefile.am |
| 49 |
++++ b/src/exec/dxexec/Makefile.am |
| 50 |
+@@ -12,10 +12,10 @@ libDXEXEC_la_CFLAGS = $(AM_CFLAGS) |
| 51 |
+ bindir = $(libdir)/dx/bin_@ARCH@ |
| 52 |
+ bin_PROGRAMS = dxexec |
| 53 |
+ |
| 54 |
+-dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \ |
| 55 |
+- ../dxmods/libDXMODSN.la ../libdx/libLIBDX.la ../libdx/mem.lo \ |
| 56 |
+- ../libdx/memory.lo ../hwrender/libHW.la ../hwrender/opengl/libOPENGL.la |
| 57 |
+-dxexec_LDFLAGS = @DXEXEC_EXP@ |
| 58 |
++dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la \ |
| 59 |
++ ../dxmods/libDXMODSN.la ../libdx/libLIBDX.la ../libdx/libmem.la \ |
| 60 |
++ ../hwrender/libHW.la ../hwrender/opengl/libOPENGL.la |
| 61 |
++dxexec_LDFLAGS = @DXEXEC_EXP@ -no-undefined |
| 62 |
+ dxexec_SOURCES = main.c |
| 63 |
+ |
| 64 |
+ EXTRA_DIST = tmain.cpp |
| 65 |
|
| 66 |
diff --git a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild |
| 67 |
index 024c2706ae3..f0a448c98e8 100644 |
| 68 |
--- a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild |
| 69 |
+++ b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild |
| 70 |
@@ -1,4 +1,4 @@ |
| 71 |
-# Copyright 1999-2018 Gentoo Foundation |
| 72 |
+# Copyright 1999-2021 Gentoo Authors |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
EAPI=6 |
| 76 |
@@ -48,6 +48,7 @@ PATCHES=( |
| 77 |
"${FILESDIR}/${P}-szip.patch" |
| 78 |
"${FILESDIR}/${P}-null.patch" |
| 79 |
"${FILESDIR}/${P}-invalid-conversion.patch" |
| 80 |
+ "${FILESDIR}/${P}-slibtool.patch" |
| 81 |
"${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch" |
| 82 |
) |
| 83 |
|
| 84 |
@@ -61,6 +62,9 @@ src_configure() { |
| 85 |
# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c |
| 86 |
append-flags -fno-strength-reduce |
| 87 |
|
| 88 |
+ # bug #786627 |
| 89 |
+ append-cppflags -std=c++14 |
| 90 |
+ |
| 91 |
# (#82672) |
| 92 |
filter-flags -finline-functions |
| 93 |
replace-flags -O3 -O2 |
Archives