diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-12-29 11:43:58 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-12-29 11:43:58 +0100 |
| commit | f0eab56ad77b77791429dca06bdda0780b8f2275 (patch) | |
| tree | 5ecc645dc1c13aa39a37892763aaa2a4515b22c6 /sci-libs | |
| parent | net-misc/apt-cacher-ng: Fix GCC version matching thanks to Nikita Kozlov. (diff) | |
| parent | sci-libs/avogadrolibs: Add patch to fix underlinking with -Wl,--no-undefined. (diff) | |
| download | gentoo-f0eab56ad77b77791429dca06bdda0780b8f2275.tar.gz gentoo-f0eab56ad77b77791429dca06bdda0780b8f2275.tar.bz2 gentoo-f0eab56ad77b77791429dca06bdda0780b8f2275.zip | |
Merge branch 'SoapZaNet-avogadro'
* SoapZaNet-avogadro:
sci-libs/avogadrolibs: Add patch to fix underlinking with -Wl,--no-undefined.
sci-chemistry/molequeue: Version bump, required to unbundle third-party libraries.
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild | 2 | ||||
| -rw-r--r-- | sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild index 2472a69c9c02..f2a19da0b99a 100644 --- a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild +++ b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild @@ -38,7 +38,7 @@ DEPEND="${DEPEND} dev-cpp/eigen:3 test? ( dev-cpp/gtest )" -PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch ) +PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch "${FILESDIR}/"${P}-underlinking.patch ) src_configure() { local mycmakeargs=( diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch new file mode 100644 index 000000000000..b29f3afe7613 --- /dev/null +++ b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch @@ -0,0 +1,34 @@ +Fix underlinking problems in shared libraries. + +--- avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt ++++ avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt +@@ -23,4 +23,4 @@ + "${apbs_uis}" + ) + +-target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient) ++target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient AvogadroMoleQueue) +--- avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt ++++ avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt +@@ -7,3 +7,5 @@ + "" + playertool.qrc + ) ++ ++target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL) +--- avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt ++++ avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt +@@ -8,3 +8,5 @@ + "povray.cpp" + "" + ) ++ ++target_link_libraries(POVRay LINK_PRIVATE AvogadroRendering) +--- avogadrolibs-0.8.0/avogadro/qtplugins/qtaim/CMakeLists.txt ++++ avogadrolibs-0.8.0/avogadro/qtplugins/qtaim/CMakeLists.txt +@@ -34,3 +34,5 @@ + + target_link_libraries(QTAIMScenePlugin + LINK_PRIVATE AvogadroRendering ${Qt5Concurrent_LIBRARIES}) ++target_link_libraries(QTAIMExtension ++ LINK_PRIVATE ${Qt5Concurrent_LIBRARIES}) |