summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2013-01-16 08:55:38 +0000
committerSergey Popov <pinkbyte@gentoo.org>2013-01-16 08:55:38 +0000
commit813e014b28869222875e34004b0fc6f409d28142 (patch)
tree19c905c8cc60a0f27ae26e00461e8ac58cc1fdea /app-i18n
parentFix compability with dev-libs/libcdio-paranoia. (diff)
downloadgentoo-2-813e014b28869222875e34004b0fc6f409d28142.tar.gz
gentoo-2-813e014b28869222875e34004b0fc6f409d28142.tar.bz2
gentoo-2-813e014b28869222875e34004b0fc6f409d28142.zip
Fix cross-compilation, wrt bug #424473. Thanks to DaboD <daiderek AT gmail.com> for patch
(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/enca/ChangeLog6
-rw-r--r--app-i18n/enca/enca-1.13-r3.ebuild12
2 files changed, 13 insertions, 5 deletions
diff --git a/app-i18n/enca/ChangeLog b/app-i18n/enca/ChangeLog
index 1a1e23af1f77..bda784055aa3 100644
--- a/app-i18n/enca/ChangeLog
+++ b/app-i18n/enca/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/enca
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.81 2013/01/16 08:36:08 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.82 2013/01/16 08:55:38 pinkbyte Exp $
+
+ 16 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> enca-1.13-r3.ebuild:
+ Fix cross-compilation, wrt bug #424473. Thanks to DaboD <daiderek AT
+ gmail.com> for patch
16 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> -enca-1.13.ebuild,
-enca-1.13-r1.ebuild:
diff --git a/app-i18n/enca/enca-1.13-r3.ebuild b/app-i18n/enca/enca-1.13-r3.ebuild
index 45f79b30e95b..9294dcfb298b 100644
--- a/app-i18n/enca/enca-1.13-r3.ebuild
+++ b/app-i18n/enca/enca-1.13-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.13-r3.ebuild,v 1.1 2012/07/01 13:15:58 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.13-r3.ebuild,v 1.2 2013/01/16 08:55:38 pinkbyte Exp $
EAPI="4"
@@ -22,6 +22,10 @@ AUTOTOOLS_AUTORECONF=2.52
src_prepare() {
epatch "${FILESDIR}"/${PN}-remove-dirty-path-hack.patch
+ # fix crosscompilation, bug #424473
+ if tc-is-cross-compiler; then
+ sed -e "s#./make_hash#./native_make_hash#" -i tools/Makefile.am || die
+ fi
autotools-utils_src_prepare
}
@@ -37,8 +41,8 @@ src_configure() {
src_compile() {
if tc-is-cross-compiler; then
- pushd tools > /dev/null
- $(tc-getBUILD_CC) -o make_hash make_hash.c || die "native make_hash failed"
+ pushd "${AUTOTOOLS_BUILD_DIR}"/tools > /dev/null
+ $(tc-getBUILD_CC) -o native_make_hash "${S}"/tools/make_hash.c || die "native make_hash failed"
popd > /dev/null
fi
autotools-utils_src_compile