| 1 |
grobian 11/02/27 10:14:50 |
| 2 |
|
| 3 |
Modified: ChangeLog nspr-4.8.7.ebuild |
| 4 |
Log: |
| 5 |
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 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.18036-prefix/cvs/Darwin powerpc) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.156 dev-libs/nspr/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.156&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.156&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?r1=1.155&r2=1.156 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v |
| 19 |
retrieving revision 1.155 |
| 20 |
retrieving revision 1.156 |
| 21 |
diff -u -r1.155 -r1.156 |
| 22 |
--- ChangeLog 14 Jan 2011 13:37:10 -0000 1.155 |
| 23 |
+++ ChangeLog 27 Feb 2011 10:14:49 -0000 1.156 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for dev-libs/nspr |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.155 2011/01/14 13:37:10 anarchy Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.156 2011/02/27 10:14:49 grobian Exp $ |
| 29 |
+ |
| 30 |
+ 27 Feb 2011; Fabian Groffen <grobian@g.o> nspr-4.8.7.ebuild: |
| 31 |
+ Change from file to scanelf/scanmacho, such that detection of platform |
| 32 |
+ bitwidth is easier and less prone to changes across systems and output of |
| 33 |
+ file, bug #354483 |
| 34 |
|
| 35 |
*nspr-4.8.7 (14 Jan 2011) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 dev-libs/nspr/nspr-4.8.7.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.8.7.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.8.7.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.8.7.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: nspr-4.8.7.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.7.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- nspr-4.8.7.ebuild 14 Jan 2011 13:37:10 -0000 1.1 |
| 53 |
+++ nspr-4.8.7.ebuild 27 Feb 2011 10:14:49 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.7.ebuild,v 1.1 2011/01/14 13:37:10 anarchy Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.7.ebuild,v 1.2 2011/02/27 10:14:49 grobian Exp $ |
| 59 |
|
| 60 |
EAPI=3 |
| 61 |
|
| 62 |
@@ -43,9 +43,9 @@ |
| 63 |
|
| 64 |
echo > "${T}"/test.c |
| 65 |
$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o |
| 66 |
- case $(file "${T}"/test.o) in |
| 67 |
- *64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";; |
| 68 |
- *32-bit*|*ppc*|*i386*|*"RISC System/6000"*) ;; |
| 69 |
+ case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in |
| 70 |
+ ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";; |
| 71 |
+ ELFCLASS32*|POWERPC*|I386*|ARM*) ;; |
| 72 |
*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; |
| 73 |
esac |
Archives