Fix by Jungshik Shin for cross-compiling #473970.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 32 insertions, 5 deletions

diff --git a/dev-util/ragel/ChangeLog b/dev-util/ragel/ChangeLog
index 458955f1a3dc..777656bce462 100644
--- a/dev-util/ragel/ChangeLog
+++ b/dev-util/ragel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/ragel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ChangeLog,v 1.62 2013/03/09 09:17:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ChangeLog,v 1.63 2013/08/28 06:26:15 vapier Exp $
+
+  28 Aug 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/ragel-6.7-cross-compile.patch, ragel-6.7-r1.ebuild, ragel-6.8.ebuild:
+  Fix by Jungshik Shin for cross-compiling #473970.
 
 *ragel-6.8 (09 Mar 2013)
 
diff --git a/dev-util/ragel/files/ragel-6.7-cross-compile.patch b/dev-util/ragel/files/ragel-6.7-cross-compile.patch
new file mode 100644
index 000000000000..e953a1aeeeef
--- /dev/null
+++ b/dev-util/ragel/files/ragel-6.7-cross-compile.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/473970
+
+already sent upstream
+
+patch by Jungshik Shin
+
+--- ragel-6.7/configure.in
++++ ragel-6.7/configure.in
+@@ -27,9 +27,9 @@
+ 
+ dnl Choose defaults for the build_parsers and build_manual vars. If the dist
+ dnl file is present in the root then default to no, otherwise go for it.
+-AC_CHECK_FILES( $srcdir/DIST, 
+-	[ . $srcdir/DIST; ], 
+-	[ build_parsers=yes; build_manual=yes; ] )
++
++AS_IF([test -r $srcdir/DIST], [. $srcdir/DIST], [build_parsers=yes;
++       build_manual=yes])
+ 
+ dnl
+ dnl Enable arg to explicitly control the building of the manual
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
index 950f41834c61..f727bafb05da 100644
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ b/dev-util/ragel/ragel-6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.7-r1.ebuild,v 1.12 2013/01/28 15:01:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.7-r1.ebuild,v 1.13 2013/08/28 06:26:15 vapier Exp $
 
 EAPI=4
 
@@ -25,6 +25,7 @@ DOCS=( ChangeLog CREDITS README TODO )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}+gcc-4.7.patch
+	epatch "${FILESDIR}"/${P}-cross-compile.patch #473970
 	sed -i -e '/CXXFLAGS/d' configure.in || die
 
 	eautoreconf
@@ -44,6 +45,6 @@ src_install() {
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim || die "doins ragel.vim failed"
+		doins ragel.vim
 	fi
 }
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
index 05a86395b0c7..6567ac6f5a91 100644
--- a/dev-util/ragel/ragel-6.8.ebuild
+++ b/dev-util/ragel/ragel-6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.8.ebuild,v 1.1 2013/03/09 09:17:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.8.ebuild,v 1.2 2013/08/28 06:26:15 vapier Exp $
 
 EAPI=5
 
@@ -24,6 +24,7 @@ RESTRICT=test
 DOCS=( ChangeLog CREDITS README TODO )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.7-cross-compile.patch #473970
 	sed -i -e '/CXXFLAGS/d' configure.in || die
 
 	eautoreconf
@@ -39,6 +40,6 @@ src_install() {
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim || die "doins ragel.vim failed"
+		doins ragel.vim
 	fi
 }