1 |
commit: 1b1bbaacd217d1c9bdeea2f88b52f079fad1c231 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 3 11:54:04 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 3 13:45:41 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b1bbaac |
7 |
|
8 |
media-libs/jasper: Fix underlinking detected using ld.gold |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=601070 |
11 |
|
12 |
Package-Manager: portage-2.3.2 |
13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
14 |
|
15 |
media-libs/jasper/files/jasper-2.0.0-add_libm.patch | 11 +++++++++++ |
16 |
media-libs/jasper/jasper-2.0.0.ebuild | 5 ++++- |
17 |
2 files changed, 15 insertions(+), 1 deletion(-) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000..8ca2ea6 |
22 |
--- /dev/null |
23 |
+++ b/media-libs/jasper/files/jasper-2.0.0-add_libm.patch |
24 |
@@ -0,0 +1,11 @@ |
25 |
+--- jasper-2.0.0/src/libjasper/CMakeLists.txt.ori 2016-11-28 13:32:57.245053411 +0100 |
26 |
++++ jasper-2.0.0/src/libjasper/CMakeLists.txt 2016-11-28 13:33:24.707547620 +0100 |
27 |
+@@ -135,6 +135,8 @@ |
28 |
+ "${CMAKE_CURRENT_SOURCE_DIR}/include" |
29 |
+ ) |
30 |
+ |
31 |
++target_link_libraries(libjasper m) |
32 |
++ |
33 |
+ if (UNIX) |
34 |
+ set_target_properties(libjasper PROPERTIES OUTPUT_NAME jasper) |
35 |
+ endif() |
36 |
|
37 |
diff --git a/media-libs/jasper/jasper-2.0.0.ebuild b/media-libs/jasper/jasper-2.0.0.ebuild |
38 |
index 199e8dc..d4e7deb 100644 |
39 |
--- a/media-libs/jasper/jasper-2.0.0.ebuild |
40 |
+++ b/media-libs/jasper/jasper-2.0.0.ebuild |
41 |
@@ -33,12 +33,15 @@ RDEPEND=" |
42 |
>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}] |
43 |
>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}] |
44 |
virtual/glu |
45 |
+ x11-libs/libXi[${MULTILIB_USEDEP}] |
46 |
+ x11-libs/libXmu[${MULTILIB_USEDEP}] |
47 |
)" |
48 |
DEPEND="${RDEPEND} |
49 |
app-arch/unzip" |
50 |
|
51 |
PATCHES=( |
52 |
- "${FILESDIR}"/${PN}-2.0.0-fix-build-system.patch |
53 |
+ "${FILESDIR}"/${P}-fix-build-system.patch |
54 |
+ "${FILESDIR}"/${P}-add_libm.patch |
55 |
) |
56 |
|
57 |
multilib_src_configure() { |