Fix crosscompilation, bug #349128 by Stuart Longland.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 117 insertions, 14 deletions

diff --git a/media-gfx/fbv/ChangeLog b/media-gfx/fbv/ChangeLog
index 6a88ff03cc8a..14564a0b3138 100644
--- a/media-gfx/fbv/ChangeLog
+++ b/media-gfx/fbv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbv
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.20 2011/09/14 11:31:48 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.21 2012/03/04 09:16:22 pacho Exp $
+
+  04 Mar 2012; Pacho Ramos <pacho@gentoo.org> +files/fbv-1.0b-cc.patch,
+  fbv-1.0b.ebuild:
+  Fix crosscompilation, bug #349128 by  Stuart Longland.
 
   14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> fbv-1.0b.ebuild,
   +files/fbv-1.0b-libpng15.patch:
diff --git a/media-gfx/fbv/Manifest b/media-gfx/fbv/Manifest
index 07820fecbd43..c369920ebc1d 100644
--- a/media-gfx/fbv/Manifest
+++ b/media-gfx/fbv/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX fbv-1.0b-cc.patch 3258 RMD160 a55a3a3eec70c8e74e80cecedd02d98381c1097b SHA1 9ca6a0fee98ec731a7f22153fb72531eb85c88a0 SHA256 a87c7281467617a7879d38707cc918b51cfe326486749b2815b5ae40958dd24c
 AUX fbv-1.0b-libpng15.patch 528 RMD160 b698b6725250bf720c2b8102c66221d64aec8157 SHA1 12b99ca887048168fdc1ee81c6fd6c440753e197 SHA256 46d3e21f64aea6630e648764678463781fbf9ecfe5728e4f53e603bade09721f
 AUX oob-segfault-fbv-1.0b.diff 559 RMD160 95ca87d8166bfdeae812aa3c9a69e7896f5130cf SHA1 3dc28bce9d372a380be76b58e1d44446820ad845 SHA256 ccc655a98fb41485d100178cf724fc7577c71bc571b227f25bf4921ebf601341
 DIST fbv-1.0b.tar.gz 18989 RMD160 d7b1c9542e8bcd38edf33a47fa87560716ef77d7 SHA1 96eb6d345286b50d32a985b7e447e2f9f7c96bed SHA256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c
-EBUILD fbv-1.0b.ebuild 1250 RMD160 35a74505bdddc02986165ab7cae8f1d31f6487c1 SHA1 85590a0eddff618cbedda517bb3b45df30f2bcdf SHA256 6791579da5d9f2bac227b4a0733a12f6934128e3f9ec6e7ac380130e65196433
-MISC ChangeLog 2685 RMD160 606a311f31dfbe3f4c1440680d6f2b6a2d671419 SHA1 909adb45d7e7a851562f0c0ef58fc79cff8f7ecc SHA256 e22aac22f3204fab69b62e03e3cf58efb5f2d2b86e8d16dc434131c88f18c3ee
+EBUILD fbv-1.0b.ebuild 1325 RMD160 906393fd9d45729aa536609a95c874a0a2e1ae23 SHA1 a2288653a357f9725df05106862e77a676285576 SHA256 2c364a908024b96f5dd52245b6068ebea007fae4d669324c8eed449ebe809ea1
+MISC ChangeLog 2830 RMD160 fcc163625567a49963d38bf127a73cdc4b1ef051 SHA1 1f44f4eac05bb0a60de56c024c80b5c8a0cf736a SHA256 11b9fc95c8a4c35cc16e03eac6da8ea0e19235de7342e141b25425030d6407a5
 MISC metadata.xml 248 RMD160 55f25ec59877ec3627fa4aaa346a61eacf403cad SHA1 3e7cd001b0c0005e3a86cb73d8ce32c2ad50d2fe SHA256 7404eee9a4427538674065b37d113a6531546b1126da727a21b6dbae1926bf98
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ov4ACgkQfXuS5UK5QB14FgQAhJQDIA4c2uJfSaj9wpAyIpWm
-gCckoHf7sGnB7mrfZmo9dKEzkXJAPRqnGTrqqAJJ5Iq35EcnvPFYiLfDFqNQHF6Z
-y7VD1ndJCHBMGkFvCo+kgfUzxFjdt0MHsnXtCLIQlJpBx6Pi1m557HoE+ajJBW5j
-C5ZGnqqid41XUDXJKJc=
-=IVpf
+iEYEARECAAYFAk9TMuwACgkQCaWpQKGI+9SEdQCdH1X76PpxWmmblkoM/seDBe6j
+SfYAnRqzWjG4+pQ5FoXXJfElGJE+S5Ze
+=UI11
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbv/fbv-1.0b.ebuild b/media-gfx/fbv/fbv-1.0b.ebuild
index c53d51354ddc..01b2a9602534 100644
--- a/media-gfx/fbv/fbv-1.0b.ebuild
+++ b/media-gfx/fbv/fbv-1.0b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.15 2011/09/14 11:31:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.16 2012/03/04 09:16:22 pacho Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/oob-segfault-fbv-${PV}.diff \
-		"${FILESDIR}"/${P}-libpng15.patch
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-cc.patch
 
 	sed -i -e 's:-lungif:-lgif:g' configure Makefile || die
 }
@@ -35,6 +36,8 @@ src_configure() {
 	use jpeg || myconf="${myconf} --without-libjpeg"
 
 	./configure \
+		--cc="$(tc-getCC)" \
+		--libs="${LDFLAGS}" \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/media-gfx/fbv/files/fbv-1.0b-cc.patch b/media-gfx/fbv/files/fbv-1.0b-cc.patch
new file mode 100644
index 000000000000..531148f10816
--- /dev/null
+++ b/media-gfx/fbv/files/fbv-1.0b-cc.patch
@@ -0,0 +1,97 @@
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: package/.../fbv/cc.patch
+# Copyright (C) 2007 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+Imported from Atmel.
+
+  - Rene Rebe <rene@exactcode.de>
+
+diff -ur fbv-1.0b/configure fbv-1.0b-avr32/configure
+--- fbv-1.0b/configure	2004-09-07 13:29:27.000000000 +0200
++++ fbv-1.0b-avr32/configure	2006-05-04 11:10:06.000000000 +0200
+@@ -21,6 +21,7 @@
+ unset png
+ unset bmp
+ unset dfb
++unset CC
+ 
+ help(){
+ cat << EOF >&2
+@@ -33,6 +34,7 @@
+ General:
+   --help	print this message
+   --libs=LIBS	additional libraries required (try -lX11 for ungif, -lz for PNG)
++  --cc=CC	specify compiler to use
+   
+ Directory and file names:
+   --prefix=PREFIX	install files in PREFIX [/usr/local]
+@@ -53,7 +55,7 @@
+ --long help,\
+ prefix:,srcdir:,bindir:,\
+ infodir:,mandir:,\
+-without-libungif,without-libjpeg,without-libpng,without-bmp,libs: \
++without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \
+ -n "$BASENAME" -- "$@")
+ 
+ if [ $? != 0 ] ; then help ; exit 1 ; fi
+@@ -65,6 +67,7 @@
+ 	case "$1" in
+ 		-h|--help) help ; exit 0 ;;
+ 		--libs) libs="$2"; shift 2 ;;
++		--cc) CC="$2"; shift 2 ;;
+ 		--prefix) prefix="$2" ; shift 2 ;;
+ 		--srcdir) srcdir="$2" ; shift 2 ;;
+ 		--bindir) bindir="$2" ; shift 2 ;;
+@@ -80,6 +83,7 @@
+ 	esac
+ done
+ 
++[ -z "$CC" ] && CC=cc
+ [ -z "$prefix" ] && prefix="/usr/local"
+ [ -z "$bindir" ] && bindir="${prefix}/bin"
+ [ -z "$mandir" ] && mandir="${prefix}/man"
+@@ -106,12 +110,12 @@
+ ungif="no"
+ echo "libungif check" >>./config.log
+ echo "  1st:" >>./config.log
+-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
++$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
+ if [ -e \$\$~test ]; then
+ 	libs="-lungif $libs" ; ungif="yes"
+ else
+ 	echo "  2nd: -lX11 -L$xdir/lib" >>./config.log
+-	cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
++	$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
+ 	if [ -e \$\$~test ]; then
+ 	libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
+ 	fi
+@@ -124,7 +128,7 @@
+ echo -n "checking for libjpeg presence... "
+ if [ "$jpeg" != "disabled" ]; then
+ jpeg="no"
+-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
++$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
+ if [ -e \$\$~test ]; then
+ 	libs="-ljpeg $libs" ; jpeg="yes"
+ fi
+@@ -135,7 +139,7 @@
+ echo -n "checking for libpng presence... "
+ if [ "$png" != "disabled" ]; then
+ png="no"
+-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
++$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
+ if [ -e \$\$~test ]; then
+ 	libs="-lpng $libs" ; png="yes"
+ fi