summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-12-05 17:40:20 +0100
committerJustin Lecher <jlec@gentoo.org>2015-12-05 17:41:10 +0100
commitcd5b67b2172a17342c21c873ba7e213a6b7c89e0 (patch)
tree8f7a9841244bc838fda11cf004c54aaa59455ead /media-libs
parentdev-python/testfixtures: Version Bump (diff)
downloadgentoo-cd5b67b2172a17342c21c873ba7e213a6b7c89e0.tar.gz
gentoo-cd5b67b2172a17342c21c873ba7e213a6b7c89e0.tar.bz2
gentoo-cd5b67b2172a17342c21c873ba7e213a6b7c89e0.zip
media-libs/gegl: Fix underlinking
Gnome-Bugs: https://bugzilla.gnome.org/show_bug.cgi?id=759065 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/gegl/files/gegl-0.3.4-underlinking.patch31
-rw-r--r--media-libs/gegl/gegl-0.3.4.ebuild4
-rw-r--r--media-libs/gegl/metadata.xml20
3 files changed, 44 insertions, 11 deletions
diff --git a/media-libs/gegl/files/gegl-0.3.4-underlinking.patch b/media-libs/gegl/files/gegl-0.3.4-underlinking.patch
new file mode 100644
index 000000000000..a7a62909efdc
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.4-underlinking.patch
@@ -0,0 +1,31 @@
+From 8dd23b1ed5f1ce065839f15a21ca28766835f1fd Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Sat, 5 Dec 2015 17:34:48 +0100
+Subject: [PATCH] Fix underlinking (-lm) of libgegl.so
+
+When linking with ld.gold the builds fails due to underlinking of libgegl.so
+./.libs/libgegl-0.3.so: error: undefined reference to 'tanhf'
+
+Gnome-Bugs: https://bugzilla.gnome.org/show_bug.cgi?id=759065
+
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
+---
+ gegl/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index e26099c..e53777d 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -39,7 +39,7 @@ AM_LDFLAGS = \
+ $(no_undefined) -export-dynamic -version-info $(GEGL_LIBRARY_VERSION)
+
+ LIBS = \
+- $(DEP_LIBS) $(BABL_LIBS)
++ $(DEP_LIBS) $(BABL_LIBS) -lm
+
+ GEGL_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)
+
+--
+2.6.3
+
diff --git a/media-libs/gegl/gegl-0.3.4.ebuild b/media-libs/gegl/gegl-0.3.4.ebuild
index ce3348cb7019..764b6c98fef9 100644
--- a/media-libs/gegl/gegl-0.3.4.ebuild
+++ b/media-libs/gegl/gegl-0.3.4.ebuild
@@ -77,7 +77,9 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.3.4-endian.patch
+ epatch \
+ "${FILESDIR}"/${PN}-0.3.4-endian.patch \
+ "${FILESDIR}"/${P}-underlinking.patch
# FIXME: the following should be proper patch sent to upstream
# fix OSX loadable module filename extension
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
index 93d122d4a6f3..0492c2c9d178 100644
--- a/media-libs/gegl/metadata.xml
+++ b/media-libs/gegl/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>sping@gentoo.org</email>
-</maintainer>
-<use>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection.</flag>
- <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
- <flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
- <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
- <flag name="webp">Enable support for <pkg>media-libs/libwebp</pkg></flag>
-</use>
+ <maintainer>
+ <email>sping@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection.</flag>
+ <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
+ <flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
+ <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+ <flag name="webp">Enable support for <pkg>media-libs/libwebp</pkg></flag>
+ </use>
</pkgmetadata>