diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-23 14:11:50 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-23 14:11:50 +0000 |
| commit | 95f00d88d87aa096951fdf6c466862f0023fce65 (patch) | |
| tree | b3410bde360c92eb3c4b3daa69ee768bda82a635 /media-libs/imlib2 | |
| parent | old (diff) | |
| download | gentoo-2-95f00d88d87aa096951fdf6c466862f0023fce65.tar.gz gentoo-2-95f00d88d87aa096951fdf6c466862f0023fce65.tar.bz2 gentoo-2-95f00d88d87aa096951fdf6c466862f0023fce65.zip | |
Fix out-of-source builds, bug #510522.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'media-libs/imlib2')
| -rw-r--r-- | media-libs/imlib2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/imlib2/files/imlib2-1.4.6-out-of-source-build.patch | 28 | ||||
| -rw-r--r-- | media-libs/imlib2/imlib2-1.4.6-r2.ebuild | 7 |
3 files changed, 38 insertions, 3 deletions
diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog index 69f736cda3d5..db89f859a7cb 100644 --- a/media-libs/imlib2/ChangeLog +++ b/media-libs/imlib2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/imlib2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.124 2014/06/18 19:35:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.125 2014/06/23 14:11:50 mgorny Exp $ + + 23 Jun 2014; Michał Górny <mgorny@gentoo.org> + +files/imlib2-1.4.6-out-of-source-build.patch, imlib2-1.4.6-r2.ebuild: + Fix out-of-source builds, bug #510522. 18 Jun 2014; Michał Górny <mgorny@gentoo.org> imlib2-1.4.6-r2.ebuild, imlib2-9999.ebuild: diff --git a/media-libs/imlib2/files/imlib2-1.4.6-out-of-source-build.patch b/media-libs/imlib2/files/imlib2-1.4.6-out-of-source-build.patch new file mode 100644 index 000000000000..84426283f8fa --- /dev/null +++ b/media-libs/imlib2/files/imlib2-1.4.6-out-of-source-build.patch @@ -0,0 +1,28 @@ +From 8d5ebc7399ee03d742a1abe115905c807f8186e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sat, 17 May 2014 09:23:02 +0200 +Subject: [PATCH] Fix -I flags to support building out-of-source. + +When building out-of-source, the headers are located in subdirectories +in $(top_srcdir) rather than $(top_builddir). Adjust AM_CPPFLAGS +accordingly. +--- + src/bin/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am +index 1d3d445..111c24a 100644 +--- a/src/bin/Makefile.am ++++ b/src/bin/Makefile.am +@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in + + AM_CPPFLAGS = \ + -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +--I$(top_builddir)/src/lib \ ++-I$(top_srcdir)/src/lib \ + $(X_CFLAGS) + + if BUILD_X11 +-- +1.9.3 + diff --git a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild index 48b3c60b76cd..6224ecd80807 100644 --- a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild +++ b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.3 2014/06/18 19:35:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.4 2014/06/23 14:11:50 mgorny Exp $ # NOTE!!!: to avoid masking of -9999 the # package.mask entry for multilib version @@ -16,7 +16,7 @@ if [[ ${PV} != "9999" ]] ; then EKEY_STATE="snap" fi -inherit enlightenment toolchain-funcs multilib-minimal +inherit autotools enlightenment toolchain-funcs multilib-minimal DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" HOMEPAGE="http://www.enlightenment.org/" @@ -45,6 +45,9 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894 epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634 + epatch "${FILESDIR}"/${P}-out-of-source-build.patch #510522 + + eautomake } multilib_src_configure() { |