Use `as` and `file` to determine the toolchain endianness #171849.

Package-Manager: portage-2.1.3_rc6

8 files changed, 111 insertions, 54 deletions

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index 920877bd02f1..9711c3c77143 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/uclibc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.21 2007/04/07 11:13:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.22 2007/06/30 12:16:34 vapier Exp $
+
+  30 Jun 2007; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.27-r1.ebuild,
+  uclibc-0.9.28.ebuild, uclibc-0.9.28-r1.ebuild, uclibc-0.9.28-r2.ebuild,
+  uclibc-0.9.28.1.ebuild, uclibc-0.9.28.3.ebuild:
+  Use `as` and `file` to determine the toolchain endianness #171849.
 
   07 Apr 2007; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.28.3.ebuild:
   Install hostutils (ldd/ldconfig) for cross-compilers #172207.
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 59864b625815..936376b164dc 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST uClibc-0.9.27-cvs-update-20050114.patch.bz2 839 RMD160 08439855b6dc481216132d3882b8f634ecbe4555 SHA1 0e1a400745f0cbd739c6c08f45951eea836b1102 SHA256 83b86570ed0f0109f2ff04e753daf18a9bf59eab5b01b8d04a2406bb4100c423
 DIST uClibc-0.9.27-patches-1.6.tar.bz2 24001 RMD160 eca81853e00e5144c165b2eb4733059d53f93234 SHA1 93beb60660145c1b661c577f1e89a7217841c0c9 SHA256 78ff8162423b5563b1a97ae5294ab1e919b9489e171962053da54c04ee127797
 DIST uClibc-0.9.27.tar.bz2 1693895 RMD160 4c580c0c468bcd7e77a6b4223847f17b6ad241cc SHA1 e0de53949998253e25e6b946b564062babb723b4 SHA256 d43098b9d1cac5cc983672f885d82b59459c3abcb12ef8141653581c77cd0d9c
@@ -10,34 +13,34 @@ DIST uClibc-0.9.28.3-patches-1.0.tar.bz2 16079 RMD160 2224a7b826932fcd5c96a0bddb
 DIST uClibc-0.9.28.3.tar.bz2 1795383 RMD160 61591281f4193d4dcd0fa3252fb3286028d4cb63 SHA1 77c5220697a1772d0d9da4bda0d866e4f4b68540 SHA256 1d86d5dad6060e7057cfe023ffc7b7661bdc7fe95112b37447851c0a75b547a1
 DIST uClibc-0.9.28.tar.bz2 1763847 RMD160 41646bd94459a9c6f10aea4a4483fa4fedf30e7d SHA1 9124a6e5b0454da3f967725d54fde806189ad27b SHA256 c8bc5383eafaa299e9874ae50acc6549f8b54bc29ed64a9a3387b3e4cd7f4bcb
 DIST uClibc-locale-030818.tgz 236073 RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 SHA1 78f901e6ed228ed84106bd034c1b97eee1eecb50 SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57
-EBUILD uclibc-0.9.27-r1.ebuild 12133 RMD160 309ab9c5ad282bb1176bbd29d27946f61dfb50e4 SHA1 6c5155fd0a74ee8dfb2c221b8934b4ab7fde66f9 SHA256 2773d9e5d1ed215d0e6ae63b271daae828dfbee54319574549b5922189f76416
-MD5 69128cc1c66737422f29da0b4c163fa9 uclibc-0.9.27-r1.ebuild 12133
-RMD160 309ab9c5ad282bb1176bbd29d27946f61dfb50e4 uclibc-0.9.27-r1.ebuild 12133
-SHA256 2773d9e5d1ed215d0e6ae63b271daae828dfbee54319574549b5922189f76416 uclibc-0.9.27-r1.ebuild 12133
-EBUILD uclibc-0.9.28-r1.ebuild 14032 RMD160 4f62e30a5e0e4b71d0bbd69b9466f51f46cf78bd SHA1 f723667919ce5159e65b415f2261b5b434c0b32c SHA256 8f400bcdea494efce00e7f92fbb266c9391fdb369b00c836318180cc30972af3
-MD5 f65338490799d785ded69bbc95ce9ce4 uclibc-0.9.28-r1.ebuild 14032
-RMD160 4f62e30a5e0e4b71d0bbd69b9466f51f46cf78bd uclibc-0.9.28-r1.ebuild 14032
-SHA256 8f400bcdea494efce00e7f92fbb266c9391fdb369b00c836318180cc30972af3 uclibc-0.9.28-r1.ebuild 14032
-EBUILD uclibc-0.9.28-r2.ebuild 14032 RMD160 86a92110d10fdee002dbec8d4552cf709916d1ad SHA1 b045db51e3b0f1d6a1e25f1f590c816b6fdc7b69 SHA256 586499eda66241e9e3fad96095f135f1fb6881fc1b949b08bdf51ce3596e5c4c
-MD5 c1a233d7157e0bf89ce58c959764b9ce uclibc-0.9.28-r2.ebuild 14032
-RMD160 86a92110d10fdee002dbec8d4552cf709916d1ad uclibc-0.9.28-r2.ebuild 14032
-SHA256 586499eda66241e9e3fad96095f135f1fb6881fc1b949b08bdf51ce3596e5c4c uclibc-0.9.28-r2.ebuild 14032
-EBUILD uclibc-0.9.28.1.ebuild 14073 RMD160 393da52ccef6321ca54599827f208bf9cf23feaf SHA1 3552c67794c4ff4b0157ef40764f5d89f2552614 SHA256 2358523d3e09b36d221e838ab6326449777c38146e7b5d1deec080b4f9331f1d
-MD5 3942eadb5fb9393faa10e4953dad5648 uclibc-0.9.28.1.ebuild 14073
-RMD160 393da52ccef6321ca54599827f208bf9cf23feaf uclibc-0.9.28.1.ebuild 14073
-SHA256 2358523d3e09b36d221e838ab6326449777c38146e7b5d1deec080b4f9331f1d uclibc-0.9.28.1.ebuild 14073
-EBUILD uclibc-0.9.28.3.ebuild 14268 RMD160 394c2ef8147935388d4fe48838d2e9e5692d77d2 SHA1 7807599d78b440608229565be1fec3ea916762bd SHA256 2207604b36868656292f3baacc682a96d28b362e61b03dfc325f5b197e22284f
-MD5 1603b19835b25bc792f4c71c55ec07da uclibc-0.9.28.3.ebuild 14268
-RMD160 394c2ef8147935388d4fe48838d2e9e5692d77d2 uclibc-0.9.28.3.ebuild 14268
-SHA256 2207604b36868656292f3baacc682a96d28b362e61b03dfc325f5b197e22284f uclibc-0.9.28.3.ebuild 14268
-EBUILD uclibc-0.9.28.ebuild 14025 RMD160 bad9431ab64d205f88b51ee5077b9c60228f0a45 SHA1 f363e65a6e55fba60503de27af13c184434986e5 SHA256 0545708b82deae4a9eb38e3d26f76d0a7932a849b225350f0bfbe74281306927
-MD5 0ce287b18effb1b37daf280d80979ac1 uclibc-0.9.28.ebuild 14025
-RMD160 bad9431ab64d205f88b51ee5077b9c60228f0a45 uclibc-0.9.28.ebuild 14025
-SHA256 0545708b82deae4a9eb38e3d26f76d0a7932a849b225350f0bfbe74281306927 uclibc-0.9.28.ebuild 14025
-MISC ChangeLog 11095 RMD160 019449464987a6c73f3e4ffb221fcb49aaa69c88 SHA1 f0473daf2a8bfda0efb2f27e49714ee8803ec642 SHA256 119bb746cf7aaeb33cd971f07e144ff23af6ced62136dcce2b7c5062c739a16e
-MD5 c415656bd31aa971edffedb584364c99 ChangeLog 11095
-RMD160 019449464987a6c73f3e4ffb221fcb49aaa69c88 ChangeLog 11095
-SHA256 119bb746cf7aaeb33cd971f07e144ff23af6ced62136dcce2b7c5062c739a16e ChangeLog 11095
+EBUILD uclibc-0.9.27-r1.ebuild 12335 RMD160 9cf95fa67f56e6b6f1ccc3226376077b1c22cbbb SHA1 07bb5dcf162fd3939b542b1111abce782760654e SHA256 97d57060f6ee1e18ee6b2dcecf1007fc918ccb6a3d1772c4e4b20bcda8fcbd1a
+MD5 7abd41e604673022c228d95d6535f5ec uclibc-0.9.27-r1.ebuild 12335
+RMD160 9cf95fa67f56e6b6f1ccc3226376077b1c22cbbb uclibc-0.9.27-r1.ebuild 12335
+SHA256 97d57060f6ee1e18ee6b2dcecf1007fc918ccb6a3d1772c4e4b20bcda8fcbd1a uclibc-0.9.27-r1.ebuild 12335
+EBUILD uclibc-0.9.28-r1.ebuild 14234 RMD160 79e62f6f74030bbea61e9430589251133182364f SHA1 3ff17ff17efc0ea3cf9a096a4fb01fccb40e9efb SHA256 b25283345ea59d691a1302f430ec6f6f1d1ba6a1109e33dc5d581016848258b7
+MD5 9cfbf53e5e1b8f94692fe286da2cffdb uclibc-0.9.28-r1.ebuild 14234
+RMD160 79e62f6f74030bbea61e9430589251133182364f uclibc-0.9.28-r1.ebuild 14234
+SHA256 b25283345ea59d691a1302f430ec6f6f1d1ba6a1109e33dc5d581016848258b7 uclibc-0.9.28-r1.ebuild 14234
+EBUILD uclibc-0.9.28-r2.ebuild 14234 RMD160 d68326593e0673bc5773913c318b960fe41a7f08 SHA1 c0d193b8a4b479a1e60ef0f0404407e8b96ca227 SHA256 c1c3f93644905a50a84a73c40db5b5c875f2f7ca0aeeede686e81301fd3cbff7
+MD5 b3a2246b86546d59e556f66f64ed963c uclibc-0.9.28-r2.ebuild 14234
+RMD160 d68326593e0673bc5773913c318b960fe41a7f08 uclibc-0.9.28-r2.ebuild 14234
+SHA256 c1c3f93644905a50a84a73c40db5b5c875f2f7ca0aeeede686e81301fd3cbff7 uclibc-0.9.28-r2.ebuild 14234
+EBUILD uclibc-0.9.28.1.ebuild 14275 RMD160 13995ade2932ccf5b1bcbcb2ddf0c43a914b5317 SHA1 3ca31a097f5dd688c7e02d1bee79fda1501cea5a SHA256 579969bda8b0b39758115044f816c8af3383ac0e2bfdd55d786f9d281812c8c4
+MD5 8d8a4e4a797192f8121a11e1f7518343 uclibc-0.9.28.1.ebuild 14275
+RMD160 13995ade2932ccf5b1bcbcb2ddf0c43a914b5317 uclibc-0.9.28.1.ebuild 14275
+SHA256 579969bda8b0b39758115044f816c8af3383ac0e2bfdd55d786f9d281812c8c4 uclibc-0.9.28.1.ebuild 14275
+EBUILD uclibc-0.9.28.3.ebuild 14465 RMD160 5aea5e9a02d1ea3acf606c75ae5512e54b26276c SHA1 a4c30a1d2dc021886d6e8a71ea1045fce252a477 SHA256 30f3b8655d1084b4f3be89368defef484661007cf56f97641bde04b19bab9e85
+MD5 51d0fdf5af10a77577b2ad2078021ab6 uclibc-0.9.28.3.ebuild 14465
+RMD160 5aea5e9a02d1ea3acf606c75ae5512e54b26276c uclibc-0.9.28.3.ebuild 14465
+SHA256 30f3b8655d1084b4f3be89368defef484661007cf56f97641bde04b19bab9e85 uclibc-0.9.28.3.ebuild 14465
+EBUILD uclibc-0.9.28.ebuild 14227 RMD160 a28b8ec30b5bfb7fb16c684069e9dfc7e9ccef7d SHA1 585cbe0b08f7dca13244f9436d667e556670e9ea SHA256 91d187c328f7f4ce919857d75091ee466f03af66f7f75fa6856a03d6ed7b7113
+MD5 a5c0f65bbdc42487a9831a82b45ab2b0 uclibc-0.9.28.ebuild 14227
+RMD160 a28b8ec30b5bfb7fb16c684069e9dfc7e9ccef7d uclibc-0.9.28.ebuild 14227
+SHA256 91d187c328f7f4ce919857d75091ee466f03af66f7f75fa6856a03d6ed7b7113 uclibc-0.9.28.ebuild 14227
+MISC ChangeLog 11364 RMD160 35ec3eba15527c226c8c42b50317e34c6dbff37e SHA1 62163799328cee3c5a68aa0ea97d3d5b428aa22a SHA256 5771ead17689e274773b796f48bb86c8434d545bd79372198e180fe55def27f0
+MD5 07f9487565dfc70bcdd3632a73e53d0c ChangeLog 11364
+RMD160 35ec3eba15527c226c8c42b50317e34c6dbff37e ChangeLog 11364
+SHA256 5771ead17689e274773b796f48bb86c8434d545bd79372198e180fe55def27f0 ChangeLog 11364
 MISC metadata.xml 999 RMD160 8367607c1e522c03d21a0f0ce68b316d42bd08cb SHA1 0433f3a405603e702c155ec67f67cb95bf628a1c SHA256 0be91c12da3e7c119ee885d360c0e983a69f0141614902bb2de6c54c08d4c56c
 MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
 RMD160 8367607c1e522c03d21a0f0ce68b316d42bd08cb metadata.xml 999
@@ -60,3 +63,10 @@ SHA256 4c2d85bf4fc8a85c50c4890041d9874dbd280f2da1c988782be2bd87b0717c81 files/di
 MD5 38b215797e74a23be7a953799554d464 files/digest-uclibc-0.9.28.3 789
 RMD160 43d6edcfaf3e9566e8134fb6958924c14ace742a files/digest-uclibc-0.9.28.3 789
 SHA256 70be88af804ec2642625ef9d0ef0feed1f6eaddaa08a3134bdb4640b83ddce8d files/digest-uclibc-0.9.28.3 789
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGhknpp/wUKkr7RBoRApghAJ4ir6LJwBNmFv0ODCQtVYS4320djgCglBZL
+bCVVhYgs6/Be0wLDOH3vAoc=
+=5uNk
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
index db8e837869e0..a637c5af1c61 100644
--- a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.27-r1.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/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.26 2007/06/26 02:56:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.27 2007/06/30 12:16:34 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -67,9 +67,16 @@ just_headers() {
 }
 
 uclibc_endian() {
-	printf "#include <endian.h>\n#if __BYTE_ORDER == __LITTLE_ENDIAN\nlittle\n#else\nbig\n#endif\n" \
-		| $(tc-getCPP ${CTARGET}) - \
-		| tail -n 1
+	# XXX: this wont work for a toolchain which is bi-endian, but we
+	#      dont have any such thing at the moment, so not a big deal
+	touch "${T}"/endian.s
+	$(tc-getAS) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "big";;
+		*" LSB "*) echo "little";;
+		*)         echo "NFC";;
+	esac
+	rm -f "${T}"/endian.{s,o}
 }
 
 pkg_setup() {
diff --git a/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild
index a197ecdf0f56..fbc07afcd180 100644
--- a/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28-r1.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/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild,v 1.11 2007/06/26 02:56:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild,v 1.12 2007/06/30 12:16:34 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -65,9 +65,16 @@ just_headers() {
 }
 
 uclibc_endian() {
-	printf "#include <endian.h>\n#if __BYTE_ORDER == __LITTLE_ENDIAN\nlittle\n#else\nbig\n#endif\n" \
-		| $(tc-getCPP ${CTARGET}) - \
-		| tail -n 1
+	# XXX: this wont work for a toolchain which is bi-endian, but we
+	#      dont have any such thing at the moment, so not a big deal
+	touch "${T}"/endian.s
+	$(tc-getAS) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "big";;
+		*" LSB "*) echo "little";;
+		*)         echo "NFC";;
+	esac
+	rm -f "${T}"/endian.{s,o}
 }
 
 pkg_setup() {
diff --git a/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild b/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild
index cbeb7c50b140..4e265a946529 100644
--- a/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28-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/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild,v 1.6 2007/06/26 02:56:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild,v 1.7 2007/06/30 12:16:34 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -65,9 +65,16 @@ just_headers() {
 }
 
 uclibc_endian() {
-	printf "#include <endian.h>\n#if __BYTE_ORDER == __LITTLE_ENDIAN\nlittle\n#else\nbig\n#endif\n" \
-		| $(tc-getCPP ${CTARGET}) - \
-		| tail -n 1
+	# XXX: this wont work for a toolchain which is bi-endian, but we
+	#      dont have any such thing at the moment, so not a big deal
+	touch "${T}"/endian.s
+	$(tc-getAS) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "big";;
+		*" LSB "*) echo "little";;
+		*)         echo "NFC";;
+	esac
+	rm -f "${T}"/endian.{s,o}
 }
 
 pkg_setup() {
diff --git a/sys-libs/uclibc/uclibc-0.9.28.1.ebuild b/sys-libs/uclibc/uclibc-0.9.28.1.ebuild
index 217af6c453a6..7b68c7596f54 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.1.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/sys-libs/uclibc/uclibc-0.9.28.1.ebuild,v 1.4 2007/06/26 02:56:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.1.ebuild,v 1.5 2007/06/30 12:16:34 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -65,9 +65,16 @@ just_headers() {
 }
 
 uclibc_endian() {
-	printf "#include <endian.h>\n#if __BYTE_ORDER == __LITTLE_ENDIAN\nlittle\n#else\nbig\n#endif\n" \
-		| $(tc-getCPP ${CTARGET}) - \
-		| tail -n 1
+	# XXX: this wont work for a toolchain which is bi-endian, but we
+	#      dont have any such thing at the moment, so not a big deal
+	touch "${T}"/endian.s
+	$(tc-getAS) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "big";;
+		*" LSB "*) echo "little";;
+		*)         echo "NFC";;
+	esac
+	rm -f "${T}"/endian.{s,o}
 }
 
 pkg_setup() {
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3.ebuild
index 284aa5bbfdb1..c6dee0d72144 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.3.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.3.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/sys-libs/uclibc/uclibc-0.9.28.3.ebuild,v 1.3 2007/06/26 02:56:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3.ebuild,v 1.4 2007/06/30 12:16:34 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -38,7 +38,7 @@ LICENSE="LGPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
-KEYWORDS="-* ~arm ~m68k -mips ~ppc ~sh ~sparc x86"
+KEYWORDS="-* arm m68k -mips ppc sh sparc x86"
 IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen savedconfig userlocales wordexp"
 RESTRICT="nostrip"
 
@@ -66,9 +66,16 @@ just_headers() {
 }
 
 uclibc_endian() {
-	printf "#include <endian.h>\n#if __BYTE_ORDER == __LITTLE_ENDIAN\nlittle\n#else\nbig\n#endif\n" \
-		| $(tc-getCPP ${CTARGET}) - \
-		| tail -n 1
+	# XXX: this wont work for a toolchain which is bi-endian, but we
+	#      dont have any such thing at the moment, so not a big deal
+	touch "${T}"/endian.s
+	$(tc-getAS) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "big";;
+		*" LSB "*) echo "little";;
+		*)         echo "NFC";;
+	esac
+	rm -f "${T}"/endian.{s,o}
 }
 
 pkg_setup() {
diff --git a/sys-libs/uclibc/uclibc-0.9.28.ebuild b/sys-libs/uclibc/uclibc-0.9.28.ebuild
index 8270e6c99108..f6a8874a3fb2 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.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/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.31 2007/06/26 02:56:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.32 2007/06/30 12:16:34 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -65,9 +65,16 @@ just_headers() {
 }
 
 uclibc_endian() {
-	printf "#include <endian.h>\n#if __BYTE_ORDER == __LITTLE_ENDIAN\nlittle\n#else\nbig\n#endif\n" \
-		| $(tc-getCPP ${CTARGET}) - \
-		| tail -n 1
+	# XXX: this wont work for a toolchain which is bi-endian, but we
+	#      dont have any such thing at the moment, so not a big deal
+	touch "${T}"/endian.s
+	$(tc-getAS) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "big";;
+		*" LSB "*) echo "little";;
+		*)         echo "NFC";;
+	esac
+	rm -f "${T}"/endian.{s,o}
 }
 
 pkg_setup() {