diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-02-27 10:14:49 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-02-27 10:14:49 +0000 |
| commit | 9c8ee523b3ef3413214b3d0dcd6b59591190544b (patch) | |
| tree | e5f3e4780014649ed8e058069b24601edc15d3cf /dev-libs/nspr | |
| parent | Marked ~ppc64 wrt #351526 (diff) | |
| download | gentoo-2-9c8ee523b3ef3413214b3d0dcd6b59591190544b.tar.gz gentoo-2-9c8ee523b3ef3413214b3d0dcd6b59591190544b.tar.bz2 gentoo-2-9c8ee523b3ef3413214b3d0dcd6b59591190544b.zip | |
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
(Portage version: 2.2.01.18036-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'dev-libs/nspr')
| -rw-r--r-- | dev-libs/nspr/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/nspr/nspr-4.8.7.ebuild | 8 |
2 files changed, 10 insertions, 5 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/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 |