mgorny 14/06/19 15:12:13 Modified: graphite2-1.2.4-r1.ebuild ChangeLog Log: Fix out-of-source build of perl module, bug #509734. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.2 media-gfx/graphite2/graphite2-1.2.4-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild?r1=1.1&r2=1.2 Index: graphite2-1.2.4-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- graphite2-1.2.4-r1.ebuild 1 Mar 2014 13:33:00 -0000 1.1 +++ graphite2-1.2.4-r1.ebuild 19 Jun 2014 15:12:13 -0000 1.2 @@ -1,13 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild,v 1.1 2014/03/01 13:33:00 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild,v 1.2 2014/06/19 15:12:13 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) GENTOO_DEPEND_ON_PERL="no" -inherit eutils cmake-multilib perl-module python-any-r1 +inherit eutils perl-module python-any-r1 cmake-multilib DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" HOMEPAGE="http://graphite.sil.org/"; @@ -46,14 +46,6 @@ src_prepare() { cmake-utils_src_prepare - # fix perl linking - if use perl; then - _check_build_dir init - sed -i \ - -e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \ - contrib/perl/Build.PL || die - fi - # make tests optional if ! use test; then sed -i \ @@ -62,7 +54,7 @@ fi } -src_configure() { +multilib_src_configure() { local mycmakeargs=( "-DVM_MACHINE_TYPE=direct" # http://sourceforge.net/p/silgraphite/bugs/49/ @@ -70,7 +62,15 @@ echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON") ) - cmake-multilib_src_configure + cmake-utils_src_configure + + # fix perl linking + if multilib_is_native_abi && use perl; then + _check_build_dir init + sed -i \ + -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \ + "${S}"/contrib/perl/Build.PL || die + fi } src_compile() { 1.66 media-gfx/graphite2/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/ChangeLog?rev=1.66&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/ChangeLog?rev=1.66&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/ChangeLog?r1=1.65&r2=1.66 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- ChangeLog 1 Mar 2014 13:33:00 -0000 1.65 +++ ChangeLog 19 Jun 2014 15:12:13 -0000 1.66 @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/graphite2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.65 2014/03/01 13:33:00 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.66 2014/06/19 15:12:13 mgorny Exp $ + + 19 Jun 2014; Michał Górny <[email protected]> graphite2-1.2.4-r1.ebuild: + Fix out-of-source build of perl module, bug #509734. *graphite2-1.2.4-r1 (01 Mar 2014)
