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 E520513877A for ; Sun, 15 Jun 2014 13:03:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADB69E0DE4; Sun, 15 Jun 2014 13:03:23 +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 2C893E0DE4 for ; Sun, 15 Jun 2014 13:03:23 +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 2110533F63D for ; Sun, 15 Jun 2014 13:03:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E2C5C1831E for ; Sun, 15 Jun 2014 13:03:19 +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: <1402837367.9be11c2069a9c343291a6622005b11811cd33794.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nspr/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nspr/Manifest dev-libs/nspr/nspr-4.10.6-r1.ebuild dev-libs/nspr/nspr-4.10.6.ebuild dev-libs/nss/nss-3.16-r1.ebuild X-VCS-Directories: dev-libs/nss/ dev-libs/nspr/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 9be11c2069a9c343291a6622005b11811cd33794 X-VCS-Branch: master Date: Sun, 15 Jun 2014 13:03:19 +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: 3ea182c4-4208-4a90-9dd0-80b2fe7a49a0 X-Archives-Hash: daf192db2f3826005ce8570ad57aa1f9 commit: 9be11c2069a9c343291a6622005b11811cd33794 Author: Ian Stakenvicius gentoo org> AuthorDate: Sun Jun 15 13:01:46 2014 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Sun Jun 15 13:02:47 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=9be11c20 sync'ed nspr and nss ebuilds with updates from the portage tree --- dev-libs/nspr/Manifest | 1 - dev-libs/nspr/nspr-4.10.6-r1.ebuild | 18 ++++---- dev-libs/nspr/nspr-4.10.6.ebuild | 24 +++++++---- dev-libs/nss/nss-3.16-r1.ebuild | 86 ++++++++++++++++++++----------------- 4 files changed, 70 insertions(+), 59 deletions(-) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index e376918..f5a5b28 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -1,2 +1 @@ -DIST nspr-4.10.4.tar.gz 1107127 SHA256 eb3fcc5e4cbd90f244c19ea05c2dfb4d22df4acc777d34ec6946dbfae560d838 SHA512 9aadd94473e840246b08b4377ac68ec8a1474997b7a08484993186843afdaca65157cf8797d8922f137d881a4df6fda66edc188ba579fdc6bba429571a701222 WHIRLPOOL b52435751f7cb131523d8aef27cc0b1400fe281a018f9f7370cb8d894920d71df49d37450ba057c381590998a81796221858d2f2f06597fd71c93082854717a9 DIST nspr-4.10.6.tar.gz 1131328 SHA256 df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a SHA512 a527a7123b4291903ac69899a82ea7e82a1945550b37f59199140a80d917540fb280172adeabf0fa09420debfd0d39c89c417166cd0a50e1eb6f1929a2a7460d WHIRLPOOL 6f7f422f50343f177896d9243a9ae89878823e92ffd3511131546a32b3cf481c9af34f5fef43c8a7c1d5974fc0959e1fa06ddd67133034563e06128e50a6f1f2 diff --git a/dev-libs/nspr/nspr-4.10.6-r1.ebuild b/dev-libs/nspr/nspr-4.10.6-r1.ebuild index f874b0b..74ecfe0 100644 --- a/dev-libs/nspr/nspr-4.10.6-r1.ebuild +++ b/dev-libs/nspr/nspr-4.10.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.1 2014/03/20 13:31:07 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6-r1.ebuild,v 1.1 2014/06/13 14:19:49 axs Exp $ EAPI=5 WANT_AUTOCONF="2.5" @@ -58,15 +58,15 @@ multilib_src_configure() { case "${ABI}" in x32) myconf+=" --enable-x32";; s390x|*64) myconf+=" --enable-64bit";; - default) # no abi actually set, figure it out the old way + default) # no abi actually set, fall back to old check 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 ;; + 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 diff --git a/dev-libs/nspr/nspr-4.10.6.ebuild b/dev-libs/nspr/nspr-4.10.6.ebuild index 06d6929..305b273 100644 --- a/dev-libs/nspr/nspr-4.10.6.ebuild +++ b/dev-libs/nspr/nspr-4.10.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.1 2014/03/20 13:31:07 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild,v 1.2 2014/06/13 16:14:10 zlogene Exp $ EAPI=5 WANT_AUTOCONF="2.5" @@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug" src_prepare() { @@ -55,13 +55,13 @@ src_configure() { local myconf 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 + 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 # Ancient autoconf needs help finding the right tools. LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ @@ -73,7 +73,13 @@ src_configure() { ${myconf} } +src_compile() { + cd "${S}"/build || die + emake +} + src_install() { + cd "${S}"/build # Their build system is royally confusing, as usual MINOR_VERSION=${MIN_PV} # Used for .so version emake DESTDIR="${D}" install diff --git a/dev-libs/nss/nss-3.16-r1.ebuild b/dev-libs/nss/nss-3.16-r1.ebuild index 428c13c..50e7104 100644 --- a/dev-libs/nss/nss-3.16-r1.ebuild +++ b/dev-libs/nss/nss-3.16-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.ebuild,v 1.1 2014/03/20 13:32:21 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16-r1.ebuild,v 1.1 2014/06/14 08:27:39 mgorny Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal @@ -22,14 +22,14 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+cacert +nss-pem utils" -DEPEND="virtual/pkgconfig +DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}] >=dev-libs/nspr-${NSPR_VER}" RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib + >=dev-db/sqlite-3.5[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !<=app-emulation/emul-linux-x86-baselibs-20140508-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" RESTRICT="test" @@ -62,66 +62,73 @@ src_prepare() { # modify install path sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i source.mk + -i source.mk || die # Respect LDFLAGS sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk - popd >/dev/null + popd >/dev/null || die # Fix pkgconfig file for Prefix sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - config/Makefile + config/Makefile || die # use host shlibsign if need be #436216 if tc-is-cross-compiler ; then sed -i \ -e 's:"${2}"/shlibsign:shlibsign:' \ - cmd/shlibsign/sign.sh + cmd/shlibsign/sign.sh || die fi # dirty hack sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ - lib/ssl/config.mk + lib/ssl/config.mk || die sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ - cmd/platlibs.mk + cmd/platlibs.mk || die multilib_copy_sources - abi_specific_src_prepare() { - # Ensure we stay multilib aware - sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" "${BUILD_DIR}"/config/Makefile - } + strip-flags +} - multilib_parallel_foreach_abi abi_specific_src_prepare +multilib_src_configure() { + # Ensure we stay multilib aware + sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die } nssarch() { # Most of the arches are the same as $ARCH local t=${1:-${CHOST}} case ${t} in - aarch64*)echo "aarch64";; - hppa*) echo "parisc";; - i?86*) echo "i686";; - x86_64*) echo "x86_64";; - *) tc-arch ${t};; + aarch64*)echo "aarch64";; + hppa*) echo "parisc";; + i?86*) echo "i686";; + x86_64*) echo "x86_64";; + *) tc-arch ${t};; esac } nssbits() { - local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" - echo > "${T}"/test.c || die - ${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*) echo USE_X32=1;; - *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + # use ABI first, this will work for most cases + case "${ABI}" in + alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;; + n32) echo USE_N32=1;; + x32) echo USE_X32=1;; + s390x|*64) echo USE_64=1;; + default) # no abi actually set, fall back to old check + einfo "Running a short build test to determine 64bit'ness" + echo > "${T}"/test.c || die + ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die + case $(file "${T}"/test.o) in + *32-bit*x86-64*) echo USE_X32=1;; + *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; + *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 } multilib_src_compile() { - strip-flags - tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG} local makeargs=( CC="${CC}" @@ -240,7 +247,7 @@ multilib_src_install() { insinto /usr/include/nss doins public/nss/*.h - popd >/dev/null + popd >/dev/null || die local f nssutils # Always enabled because we need it for chk generation. @@ -261,7 +268,7 @@ multilib_src_install() { for f in ${nssutils}; do dobin ${f} done - popd >/dev/null + popd >/dev/null || die fi # Prelink breaks the CHK files. We don't have any reliable way to run @@ -276,8 +283,7 @@ multilib_src_install() { } pkg_postinst() { - - abi_specific_pkg_postinst() { + multilib_pkg_postinst() { # We must re-sign the libraries AFTER they are stripped. local shlibsign="${EROOT}/usr/bin/shlibsign" # See if we can execute it (cross-compiling & such). #436216 @@ -288,13 +294,13 @@ pkg_postinst() { generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) } - multilib_foreach_abi abi_specific_pkg_postinst + multilib_foreach_abi multilib_pkg_postinst } pkg_postrm() { - abi_specific_pkg_postrm() { - cleanup_chk "${EROOT}"/usr/$(get_libdir) + multilib_pkg_postrm() { + cleanup_chk "${EROOT}"/usr/$(get_libdir) } - multilib_foreach_abi abi_specific_pkg_postrm + multilib_foreach_abi multilib_pkg_postrm }