From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B7D9B1387FD for ; Thu, 12 Jun 2014 20:30:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A130E0857; Thu, 12 Jun 2014 20:30:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 055ACE0857 for ; Thu, 12 Jun 2014 20:30:16 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F43533BE04 for ; Thu, 12 Jun 2014 20:30:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0064F181A9 for ; Thu, 12 Jun 2014 20:30:13 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1402604930.2b60b152decfdb866be9f6fda470fde0c03cea97.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nspr/nspr-4.10.6.ebuild X-VCS-Directories: dev-libs/nspr/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 2b60b152decfdb866be9f6fda470fde0c03cea97 X-VCS-Branch: master Date: Thu, 12 Jun 2014 20:30:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 382388c1-46e7-4e00-8ea3-9578929bff26 X-Archives-Hash: 49346ba79d658059d4aceaf6ed258846 commit: 2b60b152decfdb866be9f6fda470fde0c03cea97 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Jun 12 15:27:09 2014 +0000 Commit: Ian Stakenvicius gentoo 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.