Compile native zic first and use that if we are cross-compiling.

Package-Manager: portage-2.1-r1

3 files changed, 30 insertions, 11 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 6aded9d75608..22183c417967 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.33 2006/06/27 20:32:43 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.34 2006/07/01 17:20:34 kanaka Exp $
+
+  01 Jul 2006; Joel Martin <kanaka@gentoo.org> timezone-data-2006g.ebuild:
+  Compile native zic first and use that if we are cross-compiling.
 
   27 Jun 2006; Javier Villavicencio <the_paya@gentoo.org>
   timezone-data-2006g.ebuild:
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index be3c8a691c84..04a5874dd3d3 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX timezone-data-2005n-makefile.patch 3432 RMD160 b394008ee7a97f16abcb6d5ca31069a3181c4998 SHA1 2d0f38d5ebb1c2b863ff217c1628ef1326350e3a SHA256 ff424aedb50fbc89f4e7841e1416fbf82312a8e62b24f9654c44fd9f39d55087
 MD5 e2a93415d9e744e796aa870f2fde7ab9 files/timezone-data-2005n-makefile.patch 3432
 RMD160 b394008ee7a97f16abcb6d5ca31069a3181c4998 files/timezone-data-2005n-makefile.patch 3432
@@ -34,14 +37,14 @@ EBUILD timezone-data-2006f.ebuild 1146 RMD160 f954170057233dcf795313212116835a69
 MD5 a2028c275fa85790ba7a71ca4be99cd0 timezone-data-2006f.ebuild 1146
 RMD160 f954170057233dcf795313212116835a6986a0ab timezone-data-2006f.ebuild 1146
 SHA256 bbc80032b5ada31729afed64f70c1092b781de83dfd1dd6fc149e8fcab85f0a2 timezone-data-2006f.ebuild 1146
-EBUILD timezone-data-2006g.ebuild 1251 RMD160 6e58aeeb11e3eedd8afdcc0a7d8a62846782d6f0 SHA1 8ab9ba979ec305bd8941fe943d8b3a7a7b132974 SHA256 b1e45b30a606e7417378da0021716c280a4701cc4a8f1d30a2fe18405ab0304a
-MD5 43fbb842d586d9cf48120b2470863f07 timezone-data-2006g.ebuild 1251
-RMD160 6e58aeeb11e3eedd8afdcc0a7d8a62846782d6f0 timezone-data-2006g.ebuild 1251
-SHA256 b1e45b30a606e7417378da0021716c280a4701cc4a8f1d30a2fe18405ab0304a timezone-data-2006g.ebuild 1251
-MISC ChangeLog 4264 RMD160 09acac8a5163141747385a1bd03596cfc2da1814 SHA1 5035d16c2194bee16502c5473eccb9c306b8fb37 SHA256 c21c1aaba489b80fa7a6b8fc7f7c7815b09f22d60d98d114b0d644f42ab34e9a
-MD5 54e921861b84de8aa2d43705396cb8f6 ChangeLog 4264
-RMD160 09acac8a5163141747385a1bd03596cfc2da1814 ChangeLog 4264
-SHA256 c21c1aaba489b80fa7a6b8fc7f7c7815b09f22d60d98d114b0d644f42ab34e9a ChangeLog 4264
+EBUILD timezone-data-2006g.ebuild 1436 RMD160 ccc0a35497dd278b8e7602c0feb5b3cf78190840 SHA1 e64a72a859e7779c3705f9b550d6dfbca5f1c635 SHA256 25364617a5d3649b1f6c16676084419329ce7714af554c9df0d0db09c676dcf3
+MD5 29b8c47c5f418b40f00187a20091dd0d timezone-data-2006g.ebuild 1436
+RMD160 ccc0a35497dd278b8e7602c0feb5b3cf78190840 timezone-data-2006g.ebuild 1436
+SHA256 25364617a5d3649b1f6c16676084419329ce7714af554c9df0d0db09c676dcf3 timezone-data-2006g.ebuild 1436
+MISC ChangeLog 4405 RMD160 672b45e9bea27ba5ba9b2e136f792a1a6fee68b5 SHA1 55a7ebe4cd2611cf9c4d1d0692a049550c5a8b0c SHA256 a5ecab2776d57c085742b9306b106bfe45919aeec135bc577fa46175d88945b0
+MD5 a110e1fc394e422e0fbb98de88638ba8 ChangeLog 4405
+RMD160 672b45e9bea27ba5ba9b2e136f792a1a6fee68b5 ChangeLog 4405
+SHA256 a5ecab2776d57c085742b9306b106bfe45919aeec135bc577fa46175d88945b0 ChangeLog 4405
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -64,3 +67,10 @@ SHA256 b05f6d9bc77953a3129009e5ca0819bf48dbe2964ac4f259ea4aa6fc517caa2e files/di
 MD5 4cc6d9d32b89d9a9920d45105aba6f3a files/digest-timezone-data-2006g 470
 RMD160 67142c79b806791be4839a76d6c941f2309f2db4 files/digest-timezone-data-2006g 470
 SHA256 e36bb05ea7331b5e4538cc6ca515b8346b3511ad046fdd8df7aef190964f38be files/digest-timezone-data-2006g 470
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFEprA5baW+3NC9cLgRArHRAJ9gvjN0yHc6Peqcj79belXtHVpP+ACfXpwk
+84nm5gptS5RPHuefv2/xzXY=
+=2uWz
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2006g.ebuild b/sys-libs/timezone-data/timezone-data-2006g.ebuild
index 876f643d9d05..ff1b69a63c9c 100644
--- a/sys-libs/timezone-data/timezone-data-2006g.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2006g.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2006g.ebuild,v 1.3 2006/06/27 20:32:43 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2006g.ebuild,v 1.4 2006/07/01 17:20:34 kanaka Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -21,6 +21,7 @@ S=${WORKDIR}
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${PN}-2005n-makefile.patch
+	tc-is-cross-compiler && cp -pR ${S} ${S}-native
 }
 
 src_compile() {
@@ -31,7 +32,12 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	local zic=""
+	if tc-is-cross-compiler; then
+		make -C ${S}-native CC=$(tc-getBUILD_CC) zic || die
+		zic="zic=${S}-native/zic"
+	fi
+	make install ${zic} DESTDIR="${D}" || die
 	rm -rf "${D}"/usr/share/zoneinfo-leaps
 	dodoc README Theory
 	dohtml *.htm *.jpg