commit: 2b60b152decfdb866be9f6fda470fde0c03cea97
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 15:27:09 2014 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 20:28:50 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2b60b152
dropped useless DEPEND from new nspr ebuild, expanded src_configure bit'ness
check
to use the old method if no specific ABI has been set
---
dev-libs/nspr/nspr-4.10.6.ebuild | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/dev-libs/nspr/nspr-4.10.6.ebuild b/dev-libs/nspr/nspr-4.10.6.ebuild
index 9266a4d..53b4f43 100644
--- a/dev-libs/nspr/nspr-4.10.6.ebuild
+++ b/dev-libs/nspr/nspr-4.10.6.ebuild
@@ -22,7 +22,6 @@ RDEPEND="abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20140508-r9
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
-DEPEND="${RDEPEND}"
src_prepare() {
# obsolete - mkdir build inst
@@ -60,9 +59,20 @@ multilib_src_configure() {
|| unset CROSS_COMPILE
local myconf
- case ${ABI} in
+ # use ABI first, this will work for most cases
+ case "${ABI}" in
x32) myconf+=" --enable-x32";;
s390x|*64) myconf+=" --enable-64bit";;
+ default) # no abi actually set, figure it out the old way
+ einfo "Running a short build test to determine
64bit'ness"
+ echo > "${T}"/test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o
"${T}"/test.o || die
+ case $(file "${T}"/test.o) in
+ *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*)
myconf+=" --enable-64bit";;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether your arch is
64bits or 32bits, disable distcc if you're using it, please";;
+ esac ;;
+ *) ;;
esac
# Ancient autoconf needs help finding the right tools.
