Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
Date: Tue, 29 Dec 2015 10:44:13
Message-Id: 1451340622.a339afeb7a5fa0b9a1353875b2792eb56b94c565.jlec@gentoo
1 commit: a339afeb7a5fa0b9a1353875b2792eb56b94c565
2 Author: Ted Tanberry <ted.tanberry <AT> gmail <DOT> com>
3 AuthorDate: Mon Dec 28 22:08:53 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 28 22:10:22 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a339afeb
7
8 sci-libs/avogadrolibs: Add patch to fix underlinking with -Wl,--no-undefined.
9
10 Package-Manager: portage-2.2.26
11
12 sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild | 2 +-
13 .../files/avogadrolibs-0.8.0-underlinking.patch | 34 ++++++++++++++++++++++
14 2 files changed, 35 insertions(+), 1 deletion(-)
15
16 diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
17 index 2472a69..f2a19da 100644
18 --- a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
19 +++ b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
20 @@ -38,7 +38,7 @@ DEPEND="${DEPEND}
21 dev-cpp/eigen:3
22 test? ( dev-cpp/gtest )"
23
24 -PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch )
25 +PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch "${FILESDIR}/"${P}-underlinking.patch )
26
27 src_configure() {
28 local mycmakeargs=(
29
30 diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
31 new file mode 100644
32 index 0000000..b29f3af
33 --- /dev/null
34 +++ b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
35 @@ -0,0 +1,34 @@
36 +Fix underlinking problems in shared libraries.
37 +
38 +--- avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
39 ++++ avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
40 +@@ -23,4 +23,4 @@
41 + "${apbs_uis}"
42 + )
43 +
44 +-target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient)
45 ++target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient AvogadroMoleQueue)
46 +--- avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
47 ++++ avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
48 +@@ -7,3 +7,5 @@
49 + ""
50 + playertool.qrc
51 + )
52 ++
53 ++target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL)
54 +--- avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
55 ++++ avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
56 +@@ -8,3 +8,5 @@
57 + "povray.cpp"
58 + ""
59 + )
60 ++
61 ++target_link_libraries(POVRay LINK_PRIVATE AvogadroRendering)
62 +--- avogadrolibs-0.8.0/avogadro/qtplugins/qtaim/CMakeLists.txt
63 ++++ avogadrolibs-0.8.0/avogadro/qtplugins/qtaim/CMakeLists.txt
64 +@@ -34,3 +34,5 @@
65 +
66 + target_link_libraries(QTAIMScenePlugin
67 + LINK_PRIVATE AvogadroRendering ${Qt5Concurrent_LIBRARIES})
68 ++target_link_libraries(QTAIMExtension
69 ++ LINK_PRIVATE ${Qt5Concurrent_LIBRARIES})