| 1 |
mgorny 14/06/19 15:12:13 |
| 2 |
|
| 3 |
Modified: graphite2-1.2.4-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix out-of-source build of perl module, bug #509734. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-gfx/graphite2/graphite2-1.2.4-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild?rev=1.2&view=markup |
| 13 |
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 |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: graphite2-1.2.4-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- graphite2-1.2.4-r1.ebuild 1 Mar 2014 13:33:00 -0000 1.1 |
| 23 |
+++ graphite2-1.2.4-r1.ebuild 19 Jun 2014 15:12:13 -0000 1.2 |
| 24 |
@@ -1,13 +1,13 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
| 33 |
|
| 34 |
GENTOO_DEPEND_ON_PERL="no" |
| 35 |
-inherit eutils cmake-multilib perl-module python-any-r1 |
| 36 |
+inherit eutils perl-module python-any-r1 cmake-multilib |
| 37 |
|
| 38 |
DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" |
| 39 |
HOMEPAGE="http://graphite.sil.org/" |
| 40 |
@@ -46,14 +46,6 @@ |
| 41 |
src_prepare() { |
| 42 |
cmake-utils_src_prepare |
| 43 |
|
| 44 |
- # fix perl linking |
| 45 |
- if use perl; then |
| 46 |
- _check_build_dir init |
| 47 |
- sed -i \ |
| 48 |
- -e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \ |
| 49 |
- contrib/perl/Build.PL || die |
| 50 |
- fi |
| 51 |
- |
| 52 |
# make tests optional |
| 53 |
if ! use test; then |
| 54 |
sed -i \ |
| 55 |
@@ -62,7 +54,7 @@ |
| 56 |
fi |
| 57 |
} |
| 58 |
|
| 59 |
-src_configure() { |
| 60 |
+multilib_src_configure() { |
| 61 |
local mycmakeargs=( |
| 62 |
"-DVM_MACHINE_TYPE=direct" |
| 63 |
# http://sourceforge.net/p/silgraphite/bugs/49/ |
| 64 |
@@ -70,7 +62,15 @@ |
| 65 |
echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON") |
| 66 |
) |
| 67 |
|
| 68 |
- cmake-multilib_src_configure |
| 69 |
+ cmake-utils_src_configure |
| 70 |
+ |
| 71 |
+ # fix perl linking |
| 72 |
+ if multilib_is_native_abi && use perl; then |
| 73 |
+ _check_build_dir init |
| 74 |
+ sed -i \ |
| 75 |
+ -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \ |
| 76 |
+ "${S}"/contrib/perl/Build.PL || die |
| 77 |
+ fi |
| 78 |
} |
| 79 |
|
| 80 |
src_compile() { |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.66 media-gfx/graphite2/ChangeLog |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/ChangeLog?rev=1.66&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/ChangeLog?rev=1.66&content-type=text/plain |
| 88 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/ChangeLog?r1=1.65&r2=1.66 |
| 89 |
|
| 90 |
Index: ChangeLog |
| 91 |
=================================================================== |
| 92 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v |
| 93 |
retrieving revision 1.65 |
| 94 |
retrieving revision 1.66 |
| 95 |
diff -u -r1.65 -r1.66 |
| 96 |
--- ChangeLog 1 Mar 2014 13:33:00 -0000 1.65 |
| 97 |
+++ ChangeLog 19 Jun 2014 15:12:13 -0000 1.66 |
| 98 |
@@ -1,6 +1,9 @@ |
| 99 |
# ChangeLog for media-gfx/graphite2 |
| 100 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 101 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.65 2014/03/01 13:33:00 mgorny Exp $ |
| 102 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.66 2014/06/19 15:12:13 mgorny Exp $ |
| 103 |
+ |
| 104 |
+ 19 Jun 2014; Michał Górny <mgorny@g.o> graphite2-1.2.4-r1.ebuild: |
| 105 |
+ Fix out-of-source build of perl module, bug #509734. |
| 106 |
|
| 107 |
*graphite2-1.2.4-r1 (01 Mar 2014) |
Archives