Reverting out cross-compile fixes. Will do it in autoconf.

Package-Manager: portage-2.1.1

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 523ef5347a9dacd32e8b0c4be1d18d58026ef59b..0f7802e79ea4bf2aa2d1178dc4f698dd2b9de292 100644 (file)
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,10 +1,6 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.108 2006/11/02 19:58:21 kanaka Exp $
-
-  02 Nov 2006; Joel Martin <kanaka@gentoo.org> file-4.18.ebuild:
-  To cross-compile, we need to build a native version of the 'file'
-  executable and then use that to build to magic data.
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.109 2006/11/02 20:39:54 kanaka Exp $
 
 *file-4.18 (31 Oct 2006)
 

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 33b8a7418408786bb920d130fe231a2cd011c404..f9134208334c2614a3b04057170a6798f457bf96 100644 (file)
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -23,14 +23,14 @@ EBUILD file-4.17-r1.ebuild 1499 RMD160 e41c4caa793c1899577e3f4c615810f70e2b1911
 MD5 a0e542c4f2ea801312612e146151542d file-4.17-r1.ebuild 1499
 RMD160 e41c4caa793c1899577e3f4c615810f70e2b1911 file-4.17-r1.ebuild 1499
 SHA256 15e58727f827e389f6498da510e18c18f8dcf1e9422e72f93d6855e35cb2b057 file-4.17-r1.ebuild 1499
-EBUILD file-4.18.ebuild 2116 RMD160 95cdf65d7a24256469178ff483f49279febbf416 SHA1 525c6e92c89fae0307119aefd8388c8f7c6439d8 SHA256 8d7436354c101c8f4ddc4beaf2be95bedf738a264f4e3ac2435b89ee648fd37e
-MD5 6228a5f0389c2fb5388d52895b80449b file-4.18.ebuild 2116
-RMD160 95cdf65d7a24256469178ff483f49279febbf416 file-4.18.ebuild 2116
-SHA256 8d7436354c101c8f4ddc4beaf2be95bedf738a264f4e3ac2435b89ee648fd37e file-4.18.ebuild 2116
-MISC ChangeLog 13314 RMD160 a8df68f8c2f06e29cb5968882d0cd9e08c38a845 SHA1 aaa54ee057775583bc5d5d855a382f460cf459d6 SHA256 2ba542a006b66158cc6ab1c45d57c752fc258c7cbd04edebf9104cfcd04ede15
-MD5 744319a699993cfdc6a30cb41f24bee0 ChangeLog 13314
-RMD160 a8df68f8c2f06e29cb5968882d0cd9e08c38a845 ChangeLog 13314
-SHA256 2ba542a006b66158cc6ab1c45d57c752fc258c7cbd04edebf9104cfcd04ede15 ChangeLog 13314
+EBUILD file-4.18.ebuild 1434 RMD160 2852f6c02f0c43022e1625068ad22dc0d6f7ee37 SHA1 e5966fb2eff5c3a99d1a24b5b89524144d94a46b SHA256 42de5e9eb10bea190f95a1d39cd7093ac8f79d875856a16ae3494d158d8b70af
+MD5 c97f287ee3be5724373241773a3924d5 file-4.18.ebuild 1434
+RMD160 2852f6c02f0c43022e1625068ad22dc0d6f7ee37 file-4.18.ebuild 1434
+SHA256 42de5e9eb10bea190f95a1d39cd7093ac8f79d875856a16ae3494d158d8b70af file-4.18.ebuild 1434
+MISC ChangeLog 13125 RMD160 86c8ea78b4590844a956e5fef76d47bb8bfe26d6 SHA1 a9817cc886e56c726459fee3009630c074265089 SHA256 ce8f693cfe577ae607c54afac48825e70174b6f055767ab779138a451ab332b4
+MD5 99fa5d0c7e5674eebd285db77515c923 ChangeLog 13125
+RMD160 86c8ea78b4590844a956e5fef76d47bb8bfe26d6 ChangeLog 13125
+SHA256 ce8f693cfe577ae607c54afac48825e70174b6f055767ab779138a451ab332b4 ChangeLog 13125
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -44,7 +44,7 @@ SHA256 513f44e92cb8636d765857e7510376303db301562fc9e31b54b3715b9e8209be files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFFSlFDbaW+3NC9cLgRAuuvAJ9RRbZNRJIlpxG1B1O10y+MuZ+/5gCeNQVH
-5LlpKRP8pUCBzsHodPfyg3Y=
-=P9cX
+iD8DBQFFSlelbaW+3NC9cLgRAvtsAJ9yLu/ti6cjcKj8AB9/bxV+lXv48gCfU/uO
+4GbEU7XBmU2kj00hVkoFsfI=
+=883P
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/file/file-4.18.ebuild b/sys-apps/file/file-4.18.ebuild
index a749e782b23900c4617a9ad2b6723bcbe306bca4..6c77e19d13d288ba64397031157a77d076cb1318 100644 (file)
--- a/sys-apps/file/file-4.18.ebuild
+++ b/sys-apps/file/file-4.18.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.18.ebuild,v 1.4 2006/11/02 20:12:35 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.18.ebuild,v 1.5 2006/11/02 20:39:54 kanaka Exp $
 
-inherit eutils distutils libtool toolchain-funcs
+inherit eutils distutils libtool
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -31,31 +31,11 @@ src_unpack() {
 
        # dont let python README kill main README #60043
        mv python/README{,.python}
-
-       if tc-is-cross-compiler; then
-               cp -rpP ${S} ${S}-native
-       fi
 }
 
 src_compile() {
-       local mymake=
-
-       # To cross-compile we create a native build version of the 'file'
-       # executable first and use it during the real build.
-       if tc-is-cross-compiler; then
-               cd ${S}-native
-               einfo "Doing native configure"
-               CC=$(tc-getBUILD_CC) econf --datadir=/usr/share/misc || die
-               einfo "Doing native build of 'file'"
-               CC=$(tc-getBUILD_CC) emake -C src file|| die "emake failed"
-               mymake="FILE_COMPILE=${S}-native/src/file"
-               export ac_cv_sizeof_uint8_t=1 ac_cv_sizeof_uint16_t=2
-               export ac_cv_sizeof_uint32_t=4 ac_cv_sizeof_uint64_t=8
-               cd ${S}
-               einfo "Continuing with cross-compile"
-       fi
        econf --datadir=/usr/share/misc || die
-       emake ${mymake} || die "emake failed"
+       emake || die "emake failed"
 
        use python && cd python && distutils_src_compile
 }