summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2016-12-03 12:54:04 +0100
committerJustin Lecher <jlec@gentoo.org>2016-12-03 14:45:41 +0100
commit1b1bbaacd217d1c9bdeea2f88b52f079fad1c231 (patch)
treec24b88436953cbb3364dcb8e6353638758deb0a2
parentdev-python/xarray: New package, ebuild written by me (diff)
downloadgentoo-1b1bbaac.tar.gz
gentoo-1b1bbaac.tar.bz2
gentoo-1b1bbaac.zip
media-libs/jasper: Fix underlinking detected using ld.gold
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=601070 Package-Manager: portage-2.3.2 Signed-off-by: Justin Lecher <jlec@gentoo.org>
-rw-r--r--media-libs/jasper/files/jasper-2.0.0-add_libm.patch11
-rw-r--r--media-libs/jasper/jasper-2.0.0.ebuild5
2 files changed, 15 insertions, 1 deletions
diff --git a/media-libs/jasper/files/jasper-2.0.0-add_libm.patch b/media-libs/jasper/files/jasper-2.0.0-add_libm.patch
new file mode 100644
index 000000000000..8ca2ea658251
--- /dev/null
+++ b/media-libs/jasper/files/jasper-2.0.0-add_libm.patch
@@ -0,0 +1,11 @@
+--- jasper-2.0.0/src/libjasper/CMakeLists.txt.ori 2016-11-28 13:32:57.245053411 +0100
++++ jasper-2.0.0/src/libjasper/CMakeLists.txt 2016-11-28 13:33:24.707547620 +0100
+@@ -135,6 +135,8 @@
+ "${CMAKE_CURRENT_SOURCE_DIR}/include"
+ )
+
++target_link_libraries(libjasper m)
++
+ if (UNIX)
+ set_target_properties(libjasper PROPERTIES OUTPUT_NAME jasper)
+ endif()
diff --git a/media-libs/jasper/jasper-2.0.0.ebuild b/media-libs/jasper/jasper-2.0.0.ebuild
index 199e8dcb487e..d4e7deb8ab07 100644
--- a/media-libs/jasper/jasper-2.0.0.ebuild
+++ b/media-libs/jasper/jasper-2.0.0.ebuild
@@ -33,12 +33,15 @@ RDEPEND="
>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
virtual/glu
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXmu[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
app-arch/unzip"
PATCHES=(
- "${FILESDIR}"/${PN}-2.0.0-fix-build-system.patch
+ "${FILESDIR}"/${P}-fix-build-system.patch
+ "${FILESDIR}"/${P}-add_libm.patch
)
multilib_src_configure() {