Fix cross-compiling.

4 files changed, 40 insertions, 8 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 5b391cada4e0..7541f7529e00 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/man
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.60 2004/11/08 06:15:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.61 2004/12/13 19:53:01 vapier Exp $
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.5m-cross-compile.patch, man-1.5m-r2.ebuild:
+  Fix cross-compiling.
 
   08 Nov 2004; Mike Frysinger <vapier@gentoo.org> man-1.5m-r2.ebuild:
   Install manpath symlink #70278 by Heinrich Rebehn.
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 6156826d2296..676e50e4dce3 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,9 +1,13 @@
-MD5 7c642f4865fe3906c99b88c4a5919f5c ChangeLog 8893
-MD5 0f145f7fcb48c4832fdd6c3610783280 man-1.5m-r2.ebuild 4089
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 39f796fca084e1b3029f33b01c833c37 ChangeLog 9026
+MD5 0d992f673099cf324661d15b1d6a4578 man-1.5m-r2.ebuild 4277
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 7e4bd368680d1c95bdaa6c6d5ee556f1 files/man-1.5m-locale-order.patch 454
 MD5 a1fe892ffb27e5e044ed342b611d2db1 files/makewhatis.cron 126
 MD5 9feb57fe5fbc4c123a42c7cf0314e628 files/digest-man-1.5m-r2 61
+MD5 aefc4e52d394932d7b55a5475e9284b8 files/man-1.5m-cross-compile.patch 296
 MD5 963a9363ab4bdb32e5fccaf0edc48d19 files/man-1.5m-LL-linelength.patch 475
 MD5 fc750a4d956da7cb889e89722fe8f4e2 files/man-1.5m-defmanpath-symlinks.patch 750
 MD5 3fd69820a5978ad926d9f3583b485e1a files/man-1.5m-groff-1.18.patch 689
@@ -13,3 +17,10 @@ MD5 cbbd4de51a8359a1ae81f46f2dad6bd8 files/man-1.5m-search-order.patch 489
 MD5 cb6f4195874e0c7bd39bc6ccc26611b7 files/man-1.5m-security.patch 781
 MD5 fe9f5db8b8b6feaaac25563cb294c901 files/man-1.5m-util_c-segfault.patch 2276
 MD5 de02d99d60fb0e923c37e9130989b324 files/man-1.5m-wrong-quotes-v2.patch 328
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBvfNBroRuSHgZdywRAhjQAJ4i95A1KQfTs7hTJnnVq6Jf8B13QgCfWxhL
+741TS/BhezIKV80+PoKN1GY=
+=/reY
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/man-1.5m-cross-compile.patch b/sys-apps/man/files/man-1.5m-cross-compile.patch
new file mode 100644
index 000000000000..bd498ae26147
--- /dev/null
+++ b/sys-apps/man/files/man-1.5m-cross-compile.patch
@@ -0,0 +1,10 @@
+--- man-1.5m2/src/Makefile.in.orig	2004-12-13 14:10:10.234084393 -0500
++++ man-1.5m2/src/Makefile.in	2004-12-13 14:10:32.624709119 -0500
+@@ -37,4 +37,7 @@
+ 
++makemsg:
++	$(BUILD_CC) -o makemsg makemsg.c
++
+ msg.c gripedefs.h: ../msgs/mess.en makemsg
+ 	./makemsg ../msgs/mess.en gripedefs.h msg.c
+ 
diff --git a/sys-apps/man/man-1.5m-r2.ebuild b/sys-apps/man/man-1.5m-r2.ebuild
index 5ee52291fe4d..7bcf09ae5b4e 100644
--- a/sys-apps/man/man-1.5m-r2.ebuild
+++ b/sys-apps/man/man-1.5m-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5m-r2.ebuild,v 1.4 2004/11/12 14:29:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5m-r2.ebuild,v 1.5 2004/12/13 19:53:01 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 NV="1.5m2"
 DESCRIPTION="Standard commands to read man pages"
@@ -24,8 +24,8 @@ S="${WORKDIR}/${PN}-${NV}"
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 
-	cd "${S}" && \
 	sed -i \
 		-e 's:/usr/lib/locale:$(prefix)/usr/lib/locale:g' \
 		-e 's!/usr/bin:/usr/ucb:!/usr/bin:!' \
@@ -76,14 +76,21 @@ src_unpack() {
 	# Make sure the locale is searched in the right order #37778
 	epatch ${FILESDIR}/${P}-locale-order.patch
 
+	# Fix cross compiling ... a few build apps need to be compiled 
+	# with the native gcc instead of target gcc
+	epatch ${FILESDIR}/${P}-cross-compile.patch
+
 	# use non-lazy binds for man. And let portage handling stripping.
 	append-ldflags -Wl,-z,now
-	sed -i -e \
-		s/'LDFLAGS = -s'/"LDFLAGS:=${LDFLAGS}"/g ${S}/src/Makefile.in \
+	sed -i \
+		-e "/^LDFLAGS = -s/s:=.*:=${LDFLAGS}:" \
+		${S}/src/Makefile.in \
 		|| die "failed to edit default LDLFAGS"
 }
 
 src_compile() {
+	tc-export CC BUILD_CC
+
 	local myconf=
 	use nls && myconf="+lang all" || myconf="+lang none"
 	./configure \