summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2016-07-25 14:39:10 +0200
committerSebastian Pipping <sping@gentoo.org>2016-07-25 14:42:11 +0200
commit864781034660cb31f284b09e0a94af259e6417f2 (patch)
tree3f682fcfa0ea8c6639fffe75ad1eba0c040fc40f /media-libs
parentmedia-video/devedeng: initial commit (diff)
downloadgentoo-864781034660cb31f284b09e0a94af259e6417f2.tar.gz
gentoo-864781034660cb31f284b09e0a94af259e6417f2.tar.bz2
gentoo-864781034660cb31f284b09e0a94af259e6417f2.zip
media-libs/libmypaint: Fix testing link errors (bug #589652)
Package-Manager: portage-2.2.28
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libmypaint/files/libmypaint-1.3.0_beta1-as-needed.patch28
-rw-r--r--media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild3
2 files changed, 30 insertions, 1 deletions
diff --git a/media-libs/libmypaint/files/libmypaint-1.3.0_beta1-as-needed.patch b/media-libs/libmypaint/files/libmypaint-1.3.0_beta1-as-needed.patch
new file mode 100644
index 000000000000..41e2aee786f4
--- /dev/null
+++ b/media-libs/libmypaint/files/libmypaint-1.3.0_beta1-as-needed.patch
@@ -0,0 +1,28 @@
+From b8eab3a5c264c90c30ab68c3abfccdfcfd1c6860 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 25 Jul 2016 14:00:04 +0200
+Subject: [PATCH] Fix "make check" link errors
+
+.. for ./configure LDFLAGS="-Wl,--as-needed" --enable-gegl
+---
+ tests/gegl/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/gegl/Makefile.am b/tests/gegl/Makefile.am
+index a1f34ec..2804316 100644
+--- a/tests/gegl/Makefile.am
++++ b/tests/gegl/Makefile.am
+@@ -29,8 +29,8 @@ endif
+ LDADD = \
+ $(DEPS) \
+ $(GEGL_LIBS) \
++ $(top_builddir)/tests/libmypaint-tests.a \
+ $(top_builddir)/libmypaint.la \
+- $(top_builddir)/gegl/libmypaint-gegl.la \
+- $(top_builddir)/tests/libmypaint-tests.a
++ $(top_builddir)/gegl/libmypaint-gegl.la
+
+ endif
+--
+2.9.2
+
diff --git a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
index de24c005dd27..a21af2e79497 100644
--- a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
@@ -5,7 +5,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 xdg-utils toolchain-funcs
+inherit eutils python-any-r1 xdg-utils toolchain-funcs
MY_PV=${PV/_beta/-beta.}
MY_P=${PN}-${MY_PV}
@@ -42,6 +42,7 @@ S="${WORKDIR}"/${MY_P}
src_prepare() {
xdg_environment_reset
+ epatch "${FILESDIR}"/${PN}-1.3.0_beta1-as-needed.patch
eapply_user
}