Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/fbv/files: fbv-1.0b-cc.patch
Date: Sun, 04 Mar 2012 09:16:33
Message-Id: 20120304091622.BA0C52004C@flycatcher.gentoo.org
1 pacho 12/03/04 09:16:22
2
3 Added: fbv-1.0b-cc.patch
4 Log:
5 Fix crosscompilation, bug #349128 by Stuart Longland.
6
7 (Portage version: 2.1.10.49/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-gfx/fbv/files/fbv-1.0b-cc.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbv/files/fbv-1.0b-cc.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbv/files/fbv-1.0b-cc.patch?rev=1.1&content-type=text/plain
14
15 Index: fbv-1.0b-cc.patch
16 ===================================================================
17 # --- T2-COPYRIGHT-NOTE-BEGIN ---
18 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
19 #
20 # T2 SDE: package/.../fbv/cc.patch
21 # Copyright (C) 2007 The T2 SDE Project
22 #
23 # More information can be found in the files COPYING and README.
24 #
25 # This patch file is dual-licensed. It is available under the license the
26 # patched project is licensed under, as long as it is an OpenSource license
27 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
28 # of the GNU General Public License as published by the Free Software
29 # Foundation; either version 2 of the License, or (at your option) any later
30 # version.
31 # --- T2-COPYRIGHT-NOTE-END ---
32
33 Imported from Atmel.
34
35 - Rene Rebe <rene@×××××××××.de>
36
37 diff -ur fbv-1.0b/configure fbv-1.0b-avr32/configure
38 --- fbv-1.0b/configure 2004-09-07 13:29:27.000000000 +0200
39 +++ fbv-1.0b-avr32/configure 2006-05-04 11:10:06.000000000 +0200
40 @@ -21,6 +21,7 @@
41 unset png
42 unset bmp
43 unset dfb
44 +unset CC
45
46 help(){
47 cat << EOF >&2
48 @@ -33,6 +34,7 @@
49 General:
50 --help print this message
51 --libs=LIBS additional libraries required (try -lX11 for ungif, -lz for PNG)
52 + --cc=CC specify compiler to use
53
54 Directory and file names:
55 --prefix=PREFIX install files in PREFIX [/usr/local]
56 @@ -53,7 +55,7 @@
57 --long help,\
58 prefix:,srcdir:,bindir:,\
59 infodir:,mandir:,\
60 -without-libungif,without-libjpeg,without-libpng,without-bmp,libs: \
61 +without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \
62 -n "$BASENAME" -- "$@")
63
64 if [ $? != 0 ] ; then help ; exit 1 ; fi
65 @@ -65,6 +67,7 @@
66 case "$1" in
67 -h|--help) help ; exit 0 ;;
68 --libs) libs="$2"; shift 2 ;;
69 + --cc) CC="$2"; shift 2 ;;
70 --prefix) prefix="$2" ; shift 2 ;;
71 --srcdir) srcdir="$2" ; shift 2 ;;
72 --bindir) bindir="$2" ; shift 2 ;;
73 @@ -80,6 +83,7 @@
74 esac
75 done
76
77 +[ -z "$CC" ] && CC=cc
78 [ -z "$prefix" ] && prefix="/usr/local"
79 [ -z "$bindir" ] && bindir="${prefix}/bin"
80 [ -z "$mandir" ] && mandir="${prefix}/man"
81 @@ -106,12 +110,12 @@
82 ungif="no"
83 echo "libungif check" >>./config.log
84 echo " 1st:" >>./config.log
85 -cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
86 +$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
87 if [ -e \$\$~test ]; then
88 libs="-lungif $libs" ; ungif="yes"
89 else
90 echo " 2nd: -lX11 -L$xdir/lib" >>./config.log
91 - cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
92 + $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
93 if [ -e \$\$~test ]; then
94 libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
95 fi
96 @@ -124,7 +128,7 @@
97 echo -n "checking for libjpeg presence... "
98 if [ "$jpeg" != "disabled" ]; then
99 jpeg="no"
100 -cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
101 +$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
102 if [ -e \$\$~test ]; then
103 libs="-ljpeg $libs" ; jpeg="yes"
104 fi
105 @@ -135,7 +139,7 @@
106 echo -n "checking for libpng presence... "
107 if [ "$png" != "disabled" ]; then
108 png="no"
109 -cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
110 +$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
111 if [ -e \$\$~test ]; then
112 libs="-lpng $libs" ; png="yes"
113 fi