Fix configure typo stripping -gcc from compiler name on cross-compiles. Bug

#185681, Eddy Petrisor.
(Portage version: 2.1.3.3)

4 files changed, 47 insertions, 3 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 9f8b6e3cc293..250d31591fdb 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.152 2007/07/15 21:00:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.153 2007/08/11 00:37:30 dirtyepic Exp $
+
+  11 Aug 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/freetype-2.3.5-crossbuild.patch, freetype-2.3.4-r2.ebuild,
+  freetype-2.3.5.ebuild:
+  Fix configure typo stripping -gcc from compiler name on cross-compiles. Bug
+  #185681, Eddy Petrisor.
 
   15 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> freetype-2.3.5.ebuild:
   Remove -fno-strict-aliasing as it is no longer necessary. (Red Hat bug #118021)
diff --git a/media-libs/freetype/files/freetype-2.3.5-crossbuild.patch b/media-libs/freetype/files/freetype-2.3.5-crossbuild.patch
new file mode 100644
index 000000000000..32e6ce7642d0
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.3.5-crossbuild.patch
@@ -0,0 +1,36 @@
+diff -Naur freetype-2.3.5-orig/builds/unix/configure freetype-2.3.5/builds/unix/configure
+--- freetype-2.3.5-orig/builds/unix/configure	2007-07-17 22:53:10.000000000 -0600
++++ freetype-2.3.5/builds/unix/configure	2007-07-17 22:54:53.000000000 -0600
+@@ -3270,7 +3270,7 @@
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_CC_BUILD="${build-gcc}"
++    ac_cv_prog_CC_BUILD="${build}-gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+diff -Naur freetype-2.3.5-orig/builds/unix/configure.ac freetype-2.3.5/builds/unix/configure.ac
+--- freetype-2.3.5-orig/builds/unix/configure.ac	2007-07-02 15:41:39.000000000 -0600
++++ freetype-2.3.5/builds/unix/configure.ac	2007-07-17 22:54:26.000000000 -0600
+@@ -40,7 +40,7 @@
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
+diff -Naur freetype-2.3.5-orig/builds/unix/configure.raw freetype-2.3.5/builds/unix/configure.raw
+--- freetype-2.3.5-orig/builds/unix/configure.raw	2007-07-02 15:13:50.000000000 -0600
++++ freetype-2.3.5/builds/unix/configure.raw	2007-07-17 22:54:47.000000000 -0600
+@@ -40,7 +40,7 @@
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
diff --git a/media-libs/freetype/freetype-2.3.4-r2.ebuild b/media-libs/freetype/freetype-2.3.4-r2.ebuild
index 9d3b3e2af9f1..9b53119ec3be 100644
--- a/media-libs/freetype/freetype-2.3.4-r2.ebuild
+++ b/media-libs/freetype/freetype-2.3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.4-r2.ebuild,v 1.12 2007/07/04 00:56:57 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.4-r2.ebuild,v 1.13 2007/08/11 00:37:30 dirtyepic Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -70,6 +70,7 @@ src_unpack() {
 	disable_option FT_CONFIG_OPTION_OLD_INTERNALS
 
 	epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+	epatch "${FILESDIR}"/${PN}-2.3.5-crossbuild.patch		# bug #185681
 
 	### ft2demos ###
 		cd ../ft2demos-${PV}
diff --git a/media-libs/freetype/freetype-2.3.5.ebuild b/media-libs/freetype/freetype-2.3.5.ebuild
index 0ec50028db00..17c9c8f83d4c 100644
--- a/media-libs/freetype/freetype-2.3.5.ebuild
+++ b/media-libs/freetype/freetype-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.5.ebuild,v 1.4 2007/07/15 21:00:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.5.ebuild,v 1.5 2007/08/11 00:37:30 dirtyepic Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -67,6 +67,7 @@ src_unpack() {
 	disable_option FT_CONFIG_OPTION_OLD_INTERNALS
 
 	epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+	epatch "${FILESDIR}"/${PN}-2.3.5-crossbuild.patch		# bug #185681
 
 	### ft2demos ###
 		cd ../ft2demos-${PV}