From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-850107-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 7267D1384B4
for <garchives@archives.gentoo.org>; Sat, 5 Dec 2015 16:41:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 51EBB21C026;
Sat, 5 Dec 2015 16:41:18 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C2B3721C004
for <gentoo-commits@lists.gentoo.org>; Sat, 5 Dec 2015 16:41:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7BE783405D5
for <gentoo-commits@lists.gentoo.org>; Sat, 5 Dec 2015 16:41:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 739D4C91
for <gentoo-commits@lists.gentoo.org>; Sat, 5 Dec 2015 16:41:13 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1449333670.cd5b67b2172a17342c21c873ba7e213a6b7c89e0.jlec@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/gegl/files/gegl-0.3.4-underlinking.patch media-libs/gegl/gegl-0.3.4.ebuild media-libs/gegl/metadata.xml
X-VCS-Directories: media-libs/gegl/ media-libs/gegl/files/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: cd5b67b2172a17342c21c873ba7e213a6b7c89e0
X-VCS-Branch: master
Date: Sat, 5 Dec 2015 16:41:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c777420b-bfa2-4c65-9fb5-c8c63e0b2259
X-Archives-Hash: 6454a513380387f7bbf08520a9614ab3
commit: cd5b67b2172a17342c21c873ba7e213a6b7c89e0
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 5 16:40:20 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Dec 5 16:41:10 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5b67b2
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 <AT> gentoo.org>
.../gegl/files/gegl-0.3.4-underlinking.patch | 31 ++++++++++++++++++++++
media-libs/gegl/gegl-0.3.4.ebuild | 4 ++-
media-libs/gegl/metadata.xml | 20 +++++++-------
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 0000000..a7a6290
--- /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 ce3348c..764b6c9 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 93d122d..0492c2c 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>