Add fix from upstream for cross-compiling gnulib #363647 by Dennis 'dlan' Lan.

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

4 files changed, 42 insertions, 3 deletions

diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index 872d721ace35..21d04d9f2c3f 100644
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/groff
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.124 2012/06/08 05:17:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.125 2012/11/13 19:52:24 vapier Exp $
+
+  13 Nov 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/groff-1.21-gnulib-cross.patch, groff-1.21-r1.ebuild, groff-1.21.ebuild:
+  Add fix from upstream for cross-compiling gnulib #363647 by Dennis 'dlan' Lan.
 
   08 Jun 2012; Mike Frysinger <vapier@gentoo.org> groff-1.21-r1.ebuild,
   groff-1.21.ebuild:
diff --git a/sys-apps/groff/files/groff-1.21-gnulib-cross.patch b/sys-apps/groff/files/groff-1.21-gnulib-cross.patch
new file mode 100644
index 000000000000..7f006a6f6e2d
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.21-gnulib-cross.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/363647
+
+From 943308afd2770a2f4a30103c85a20a61b15f8f35 Mon Sep 17 00:00:00 2001
+From: wl <wl>
+Date: Fri, 29 Jul 2011 20:16:42 +0000
+Subject: [PATCH] Fix cross building. Problem reported by Christophe Jarry
+ <christophe.jarry@ouvaton.org>.
+
+* Makefile.in ($GNULIBDIRS): Pass original config arguments to
+src/libs/gnulib/configure.
+---
+ ChangeLog   | 8 ++++++++
+ Makefile.in | 3 ++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ca7d7e7..09eb573 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -774,7 +774,8 @@ $(GNULIBDIRS): FORCE
+ 	case $(do) in \
+ 	all) \
+ 	cd $@; \
+-	test -f Makefile || $(SHELL) $$srcdir/configure ; \
++	args=`$(top_builddir)/config.status --config`; \
++	test -f Makefile || eval $$srcdir/configure "$$args" --srcdir=$$srcdir; \
+ 	$(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \
+ 	esac
+ 
+-- 
+1.7.12.4
+
diff --git a/sys-apps/groff/groff-1.21-r1.ebuild b/sys-apps/groff/groff-1.21-r1.ebuild
index 93374b37f381..5b63a51a5819 100644
--- a/sys-apps/groff/groff-1.21-r1.ebuild
+++ b/sys-apps/groff/groff-1.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.21-r1.ebuild,v 1.4 2012/06/08 05:17:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.21-r1.ebuild,v 1.5 2012/11/13 19:52:24 vapier Exp $
 
 EAPI="3"
 
@@ -61,6 +61,7 @@ src_prepare() {
 	# from upstream, #353287, #353377
 	epatch "${FILESDIR}"/groff-1.21-makefile.patch
 	epatch "${FILESDIR}"/groff-1.21-gnulib.patch
+	epatch "${FILESDIR}"/${PN}-1.21-gnulib-cross.patch #363647
 	# make sure we don't get a crappy `g' nameprefix on UNIX systems with real
 	# troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
 	sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die
diff --git a/sys-apps/groff/groff-1.21.ebuild b/sys-apps/groff/groff-1.21.ebuild
index 1cb1e17c91a2..b6cefbe9f625 100644
--- a/sys-apps/groff/groff-1.21.ebuild
+++ b/sys-apps/groff/groff-1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.21.ebuild,v 1.10 2012/06/08 05:17:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.21.ebuild,v 1.11 2012/11/13 19:52:24 vapier Exp $
 
 inherit autotools eutils toolchain-funcs
 
@@ -56,6 +56,8 @@ src_unpack() {
 		eautoconf
 		eautoheader
 	fi
+
+	epatch "${FILESDIR}"/${PN}-1.21-gnulib-cross.patch #363647
 }
 
 src_compile() {