Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
Date: Sat, 05 Dec 2015 16:41:22
Message-Id: 1449333670.cd5b67b2172a17342c21c873ba7e213a6b7c89e0.jlec@gentoo
1 commit: cd5b67b2172a17342c21c873ba7e213a6b7c89e0
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 5 16:40:20 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 5 16:41:10 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5b67b2
7
8 media-libs/gegl: Fix underlinking
9
10 Gnome-Bugs: https://bugzilla.gnome.org/show_bug.cgi?id=759065
11
12 Package-Manager: portage-2.2.25
13 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
14
15 .../gegl/files/gegl-0.3.4-underlinking.patch | 31 ++++++++++++++++++++++
16 media-libs/gegl/gegl-0.3.4.ebuild | 4 ++-
17 media-libs/gegl/metadata.xml | 20 +++++++-------
18 3 files changed, 44 insertions(+), 11 deletions(-)
19
20 diff --git a/media-libs/gegl/files/gegl-0.3.4-underlinking.patch b/media-libs/gegl/files/gegl-0.3.4-underlinking.patch
21 new file mode 100644
22 index 0000000..a7a6290
23 --- /dev/null
24 +++ b/media-libs/gegl/files/gegl-0.3.4-underlinking.patch
25 @@ -0,0 +1,31 @@
26 +From 8dd23b1ed5f1ce065839f15a21ca28766835f1fd Mon Sep 17 00:00:00 2001
27 +From: Justin Lecher <jlec@g.o>
28 +Date: Sat, 5 Dec 2015 17:34:48 +0100
29 +Subject: [PATCH] Fix underlinking (-lm) of libgegl.so
30 +
31 +When linking with ld.gold the builds fails due to underlinking of libgegl.so
32 +./.libs/libgegl-0.3.so: error: undefined reference to 'tanhf'
33 +
34 +Gnome-Bugs: https://bugzilla.gnome.org/show_bug.cgi?id=759065
35 +
36 +Signed-off-by: Justin Lecher <jlec@g.o>
37 +---
38 + gegl/Makefile.am | 2 +-
39 + 1 file changed, 1 insertion(+), 1 deletion(-)
40 +
41 +diff --git a/gegl/Makefile.am b/gegl/Makefile.am
42 +index e26099c..e53777d 100644
43 +--- a/gegl/Makefile.am
44 ++++ b/gegl/Makefile.am
45 +@@ -39,7 +39,7 @@ AM_LDFLAGS = \
46 + $(no_undefined) -export-dynamic -version-info $(GEGL_LIBRARY_VERSION)
47 +
48 + LIBS = \
49 +- $(DEP_LIBS) $(BABL_LIBS)
50 ++ $(DEP_LIBS) $(BABL_LIBS) -lm
51 +
52 + GEGL_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)
53 +
54 +--
55 +2.6.3
56 +
57
58 diff --git a/media-libs/gegl/gegl-0.3.4.ebuild b/media-libs/gegl/gegl-0.3.4.ebuild
59 index ce3348c..764b6c9 100644
60 --- a/media-libs/gegl/gegl-0.3.4.ebuild
61 +++ b/media-libs/gegl/gegl-0.3.4.ebuild
62 @@ -77,7 +77,9 @@ pkg_setup() {
63 }
64
65 src_prepare() {
66 - epatch "${FILESDIR}"/${PN}-0.3.4-endian.patch
67 + epatch \
68 + "${FILESDIR}"/${PN}-0.3.4-endian.patch \
69 + "${FILESDIR}"/${P}-underlinking.patch
70
71 # FIXME: the following should be proper patch sent to upstream
72 # fix OSX loadable module filename extension
73
74 diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
75 index 93d122d..0492c2c 100644
76 --- a/media-libs/gegl/metadata.xml
77 +++ b/media-libs/gegl/metadata.xml
78 @@ -1,14 +1,14 @@
79 <?xml version="1.0" encoding="UTF-8"?>
80 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
81 <pkgmetadata>
82 -<maintainer>
83 - <email>sping@g.o</email>
84 -</maintainer>
85 -<use>
86 - <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection.</flag>
87 - <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
88 - <flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
89 - <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
90 - <flag name="webp">Enable support for <pkg>media-libs/libwebp</pkg></flag>
91 -</use>
92 + <maintainer>
93 + <email>sping@g.o</email>
94 + </maintainer>
95 + <use>
96 + <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection.</flag>
97 + <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
98 + <flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
99 + <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
100 + <flag name="webp">Enable support for <pkg>media-libs/libwebp</pkg></flag>
101 + </use>
102 </pkgmetadata>