Fix up ncurses tic script to better detect cross-compiling #288881 by Sergiy Borodych.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 73 insertions, 8 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 8fbcdd462235..76829d3c67e8 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.165 2009/10/11 07:30:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.166 2009/10/22 12:30:58 vapier Exp $
+
+  22 Oct 2009; Mike Frysinger <vapier@gentoo.org> ncurses-5.7-r2.ebuild,
+  +files/ncurses-5.7-tic-cross-detection.patch:
+  Fix up ncurses tic script to better detect cross-compiling #288881 by
+  Sergiy Borodych.
 
 *ncurses-5.7-r2 (11 Oct 2009)
 
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 892e7fcca771..04d3effaa765 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -6,18 +6,19 @@ AUX ncurses-5.6-gfbsd.patch 817 RMD160 2d5a96174730a93320e391cb057880df4996854e
 AUX ncurses-5.7-emacs.patch 1934 RMD160 07b7cdb8f0975441e9823959533285f35f31e35c SHA1 c6e4259c455e83e0c166cf89d8c7d23ee77effde SHA256 daf300b7ba0bef6fc685b63f657dc4d864b53da77454129783d767522f1374b0
 AUX ncurses-5.7-hashdb-open.patch 1893 RMD160 4dbe84dc24cd727f17ff591b73b96bc4322bcf1f SHA1 585f0a2512f2ada00ee364b3336e521234c46083 SHA256 f9ab706816b270e06629ace613fcffb8ad78532075dc7ae52e27c77071b2aa66
 AUX ncurses-5.7-nongnu.patch 490 RMD160 fc755ed90de37c6492c346c4630d0fd92f720c45 SHA1 1e843d97e0f2640f6eeb2a874ad019e61aa06328 SHA256 d6fbf11c63aa872bf9553f832c8071a161b2c7bc106f0f76c4471b01025c9422
+AUX ncurses-5.7-tic-cross-detection.patch 1656 RMD160 cd30a10d49ce0a88fd031b38739032addd49d340 SHA1 584ac536cb09b84801336af4938f67c96ccab57a SHA256 afadd1db1530054cb745193723435a3dffceb9de541abc92caace89c2ea429a5
 DIST ncurses-5.6-coverity.patch.gz 6196 RMD160 b11682ae9e043be8d6c50f040d8531f80fc26ce8 SHA1 fee27bdd55c1c316248643e168865b55235d79c7 SHA256 3deeef017c739116c17574e7fd235b1b05053f5c50c7bfeeee2e3f8e4332380e
 DIST ncurses-5.6.tar.gz 2402592 RMD160 1a878819c43e6426500fd74ccedf0a032ef399d8 SHA1 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d SHA256 f9cac2b31683a37d65bc37119599752198a0691e462d0d1a252cf9815f5724d5
 DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234 SHA1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
 EBUILD ncurses-5.6-r2.ebuild 4746 RMD160 2d0c4b141d8bc51c7bbe0745817e2d5b4b51147b SHA1 ed1e10beb9f436b298b9f59e6b0b7fdfd3ae144c SHA256 57d0c3a8058ddbb1bbed9d3d65be56b7947aa1e3459fe847de3cce456fa7a61e
 EBUILD ncurses-5.7-r1.ebuild 4511 RMD160 337ebf710ea03791b4a13aa52615cd03ccf9c7b4 SHA1 4c4e091d14dd481011d7911c1e5ec6bb41d33848 SHA256 8e771b299a6b87e6fb8597fcf3756b5890aeb92d002f18fe9eafd04b0f9ed40b
-EBUILD ncurses-5.7-r2.ebuild 5090 RMD160 f53727b590b388731b4dd537e5f59518e9813f9e SHA1 b6f71906cb2826efaa01798e33f8b0843d2bcd88 SHA256 ebc3ab1232246f541835f061185a7a104fd4944260895afe3a04b2b7928f1b5e
-MISC ChangeLog 24162 RMD160 9fed28d97358969c01287bde2d6b8e4e07440692 SHA1 91fecacfeb400b8e207fb8cd41e82f82e36577c3 SHA256 0867c1b052d49ac4ad0be20bb00705af274455b24cea00f848468f59977f4a16
+EBUILD ncurses-5.7-r2.ebuild 5156 RMD160 c17433a3f1c086c6b423ea4b8327b4f23036da20 SHA1 77e9f6919a433afb36d8cd6b72a3ed383bdeb091 SHA256 8e6c75149cc8cba1f672eb71b14cc9b1794ab213e65218c4508372b047c97951
+MISC ChangeLog 24375 RMD160 04bbed29b9fde6f218eabe44f89697b10b26637a SHA1 17efcf3a854c35a37a85accb2f03150cca0b5475 SHA256 3b67d21dc5a164abc166c2536269e90c586c702926d65bdb8933525e957da142
 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrRiZoACgkQlPl3HsVfCDrQoQCdGaAzkRwdxaEpVdPVoQlqC0MZ
-aiAAnjAyc0aQOFTV7g54AiGsmcsmClJf
-=4nu2
+iEYEARECAAYFAkrgUKYACgkQlPl3HsVfCDpGqQCeIVHSrqk0y9Po50buILzCmgPk
+St0An0UURwuWdYvu+e0AwxmgZInVMObS
+=uWTn
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.7-tic-cross-detection.patch b/sys-libs/ncurses/files/ncurses-5.7-tic-cross-detection.patch
new file mode 100644
index 000000000000..a57cd78c77f6
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.7-tic-cross-detection.patch
@@ -0,0 +1,58 @@
+use $cross_compiling that autotools already set up rather than trying to
+do a custom & fragile job with compiler names
+
+configure.in also needs AC_SUBST(cross_compiling) ...
+
+http://bugs.gentoo.org/288881
+
+--- a/configure
++++ b/configure
+@@ -17300,6 +17300,7 @@
+ s,@build_alias@,$build_alias,;t t
+ s,@host_alias@,$host_alias,;t t
+ s,@target_alias@,$target_alias,;t t
++s,@cross_compiling@,$cross_compiling,;t t
+ s,@ECHO_C@,$ECHO_C,;t t
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
+--- a/misc/run_tic.in
++++ b/misc/run_tic.in
+@@ -52,8 +52,7 @@
+ : ${ticdir=@TERMINFO@}
+ : ${source=@TERMINFO_SRC@}
+ : ${LN_S="@LN_S@"}
+-: ${THAT_CC=cc}
+-: ${THIS_CC=cc}
++: ${cross_compiling=@cross_compiling@}
+ : ${ext_funcs=@NCURSES_EXT_FUNCS@}
+ 
+ test -z "${DESTDIR}" && DESTDIR=
+@@ -61,7 +60,7 @@
+ # Allow tic to run either from the install-path, or from the build-directory.
+ # Do not do this if we appear to be cross-compiling.  In that case, we rely
+ # on the host's copy of tic to compile the terminfo database.
+-if test "$THAT_CC" = "$THIS_CC" ; then
++if test "$cross_compiling" != "yes" ; then
+ case "$PATH" in
+ :*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;;
+ *) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;;
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -59,6 +59,7 @@
+ 
+ CC		= @CC@
+ HOSTCC		= @BUILD_CC@
++cross_compiling	= @cross_compiling@
+ 
+ tabsetdir	= $(datadir)/tabset
+ ticdir		= @TERMINFO@
+@@ -91,8 +92,7 @@
+ 	datadir=${datadir} \
+ 	ticdir=${ticdir} \
+ 	source=terminfo.tmp \
+-	THIS_CC="$(CC)" \
+-	THAT_CC="$(HOSTCC)" \
++	cross_compiling="${cross_compiling}" \
+ 	$(SHELL) ./run_tic.sh
+ 	@cd $(srcdir)/tabset && \
+ 		$(SHELL) -c 'for i in * ; do \
diff --git a/sys-libs/ncurses/ncurses-5.7-r2.ebuild b/sys-libs/ncurses/ncurses-5.7-r2.ebuild
index 519ced50af3a..d162c6abe8c0 100644
--- a/sys-libs/ncurses/ncurses-5.7-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r2.ebuild,v 1.1 2009/10/11 07:30:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r2.ebuild,v 1.2 2009/10/22 12:30:58 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-5.6-gfbsd.patch
 	epatch "${FILESDIR}"/${PN}-5.7-emacs.patch #270527
 	epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
+	epatch "${FILESDIR}"/${PN}-5.7-tic-cross-detection.patch #288881
 	epatch "${FILESDIR}"/${P}-hashdb-open.patch #245370
 }