diff options
| -rw-r--r-- | dev-libs/nspr/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/nspr/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/nspr/nspr-4.8.7.ebuild | 8 |
3 files changed, 12 insertions, 7 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 711d54417d19..8c6e724e0275 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.155 2011/01/14 13:37:10 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.156 2011/02/27 10:14:49 grobian Exp $ + + 27 Feb 2011; Fabian Groffen <grobian@gentoo.org> nspr-4.8.7.ebuild: + Change from file to scanelf/scanmacho, such that detection of platform + bitwidth is easier and less prone to changes across systems and output of + file, bug #354483 *nspr-4.8.7 (14 Jan 2011) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 7209dcb63f0c..b1d91be63218 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -13,6 +13,6 @@ AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa DIST nspr-4.8.6.tar.gz 1202257 RMD160 31de6eeecd4cc2315cfb84d02cb9730cd3c09729 SHA1 54ca3cbe14cc8a2a59cb48d4961034ce35c8f223 SHA256 d9040bb01536fa63881c423c4fa831ea459696b32d2097f614842f824e1a9f6d DIST nspr-4.8.7.tar.gz 1244150 RMD160 b9b71fad399949bb9faafa863d72483c3678ddc3 SHA1 34d9eb75b47a3d19b57ef1ed5aef2004e79b5fc4 SHA256 eb9459c31d43d1000fb1304f1e0cedab0bdac3c54c71988259c1ac10c1fe16a3 EBUILD nspr-4.8.6.ebuild 3483 RMD160 a3736195b5aa341e925c9fa6f09df9d0e1c75b60 SHA1 a4c153ed5f97ca7d31a55b087f2423be690a48c0 SHA256 cf1ab1d37b4af5230a773400cadf3c46b0a66bceecca1c8b746328391bfff92b -EBUILD nspr-4.8.7.ebuild 3520 RMD160 bcecf24b8f2599b5da8cdfc38d7b1514dea82793 SHA1 5f4b27717e208a9ef978f79a0518046cd0f90a33 SHA256 b42f9ad9ed2d4da45f0a3e474cdca166fa13a390847e2955879ce95e3cde8fc8 -MISC ChangeLog 20387 RMD160 4129ca68f2184624a38ed1b564febda60162bb2d SHA1 79c2dc5925a57a1686021ebd46c7925f85e8f280 SHA256 66f0438b939177270aacf60362da3b5cafffb5f9d6013b71ebf8557e704a347a +EBUILD nspr-4.8.7.ebuild 3559 RMD160 6d6da3e5e175e1941a99b42a93e0ffc6d7432436 SHA1 0d754f453e63575c639330085fa5c4c745519380 SHA256 a4333e85f983ed6468d1ef91945f9014ee544d30b1729cd254a62ea22ce0d83a +MISC ChangeLog 20627 RMD160 e3a0db9636c9165d7f50232cecb2d7ba953fbc37 SHA1 31df374077dfa2cefcff0ccbcf1d78c82599d518 SHA256 9eea41d62285bafd393ad218f543b459d4e5735e0ecda9537f5a09a6b50be1db MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b diff --git a/dev-libs/nspr/nspr-4.8.7.ebuild b/dev-libs/nspr/nspr-4.8.7.ebuild index 9ac6d0fecd94..8d58116a5296 100644 --- a/dev-libs/nspr/nspr-4.8.7.ebuild +++ b/dev-libs/nspr/nspr-4.8.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.7.ebuild,v 1.1 2011/01/14 13:37:10 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.7.ebuild,v 1.2 2011/02/27 10:14:49 grobian Exp $ EAPI=3 @@ -43,9 +43,9 @@ src_configure() { echo > "${T}"/test.c $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(file "${T}"/test.o) in - *64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";; - *32-bit*|*ppc*|*i386*|*"RISC System/6000"*) ;; + case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in + ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";; + ELFCLASS32*|POWERPC*|I386*|ARM*) ;; *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; esac |