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 A1A9B138A9D for ; Sun, 17 Feb 2013 02:59:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31CAFE0495; Sun, 17 Feb 2013 02:59:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9C87E0495 for ; Sun, 17 Feb 2013 02:59:38 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9536A33DB59 for ; Sun, 17 Feb 2013 02:59:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2EF08E4073 for ; Sun, 17 Feb 2013 02:59:36 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1361069944.89b9f49f9d37ee1dc43db18c0bc87ddd9189e06b.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nspr/Manifest dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch dev-libs/nspr/nspr-4.9.5.ebuild X-VCS-Directories: dev-libs/nspr/files/ dev-libs/nspr/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 89b9f49f9d37ee1dc43db18c0bc87ddd9189e06b X-VCS-Branch: master Date: Sun, 17 Feb 2013 02:59:36 +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: 19443d66-7e52-40c4-b682-c540aaacbcc4 X-Archives-Hash: 39796a025c5b21c1b8d7b890002d15e0 commit: 89b9f49f9d37ee1dc43db18c0bc87ddd9189e06b Author: Jory A. Pratt gentoo org> AuthorDate: Sun Feb 17 02:59:04 2013 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Feb 17 02:59:04 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=89b9f49f nspr : finish addressing bug #454576 --- dev-libs/nspr/Manifest | 3 +- dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch | 12 +++++ dev-libs/nspr/nspr-4.9.5.ebuild | 53 +++++++++++----------- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 06cd7cf..450187b 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -7,5 +7,6 @@ AUX nspr-4.8.3-aix-gcc.patch 3673 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f3 AUX nspr-4.8.3-aix-soname.patch 1164 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa SHA512 8c82c281ebc3ffade81445bef28323a89199e47a95b7ec8351cf14dc441f71d1126f112d564431e6c73657ae2de0c7cbdc701ff133d7086fd970e6c61cd58add WHIRLPOOL 90dca0ac6ae7931468d5b3835e786a817deaae1c4021fb033f127dd9aabae42975bcc8c4ccb3ea7db713b3224ec90669179cbb71a8492910a5aa75e0f8d1beac AUX nspr-4.8.4-darwin-install_name.patch 1102 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab SHA512 1c62eaea00c4eebe6885bfffca41131cfd5cd1c848d7564ccae32a39f012834684b2d3113dcb1a3d4607629dbec9909d6754491dc7caa977203e6010623fef4d WHIRLPOOL 1f5674fe691d75dbf7b9549d58700fef973a8fd6f805a389727843ffb336392587833bbb19af9c22b1388b3d3dcd2c760978676c9a55d894b646e029f8ba7280 AUX nspr-4.8.9-link-flags.patch 995 SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610 SHA512 3c20019b5a378bc0cec1925c2324fc1b72bd1427e9262065952632c406bc6a8f9303fc55aabad472713f5e8656973db5c503dd9072ea01283a6f671dcd26b049 WHIRLPOOL 695310cfd54140b2c333f0b6556d8c049441b246a006cc885d2149a6d73d8d6223964d47d5af87c949ab2693fd320c4ecf67fd120b09862972a39df0cc00c7ca +AUX nspr-4.9.5_nspr_config.patch 445 SHA256 7414eaac7630ba3aa9f3c44b439471abb195c96796f78cf5ddfd4e10c68389e8 SHA512 3d3dc60b4bb4a6b469e992239ca7e5702949880bbe3e603691bf7cab199a80e6b9fd89aa3184c26d99185b43785f6f2f7a9a16e061080e13ca02146dd2f172bf WHIRLPOOL d807bc98ca6f47d943f0b6f9a4d33dee387eddf9ae4a9d6a8863697d96c82ae1560d871b76c866b6a85b4eb1d31e9e9f1ce59caa4f66c02bd68a913f822d5a16 DIST nspr-4.9.5.tar.gz 1156396 SHA256 616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604 SHA512 cbe60e4c5265863fa3250d7c16a2727d3a4a8762d17bc63d044ec88d11758fe9f54f54c08e198db6278ee68c55edd88f7c4bc5db9bdc46bdea4e4cf9eb277f27 WHIRLPOOL d2792148805a99d1f2de919b57e48cfd03290b1f8faaec55d4374004574a578ed3fef110956fbb767a2f7f6d00cb9d594aa3a534e29df5790f3284c4fcea8b7b -EBUILD nspr-4.9.5.ebuild 3975 SHA256 70c73749c64340dcb75c8915486cceb682a6d84fd5f7c86861da9ae952b7d252 SHA512 558689f724284f1fcfc135ca443257f2a50fd4ddfa6ca4c0a777e11846b21d1b96d71a20e51a860fc6065e2501a84f4ff079369ddc7c95859630236607095fe0 WHIRLPOOL 27408c962e1355219838c4c3dfb9e3f2c32f3e4bde70ec83351e4fcdfbf5da25e85a812565d4978f60a4d0da9f6e8f4361e511b8ae25a6f1dabfa6f026be057b +EBUILD nspr-4.9.5.ebuild 3718 SHA256 fd15bb2b861aefc145b85dbc019bad8ed3980a0ad043b5f6c9ce9284da7ab7e4 SHA512 ff9f172522407cbd2bd5cbe2e6585dac4ccce363b318d4fc85bd0e63916882b530b2f4bbf130e868cf4facdc49509fcfb4f6fd71ebe60b6618fd93a0d4217178 WHIRLPOOL dd4e41735de404f5fd45c8ba4a746958831f1f2454455ef3fa044a7aace18d0f577fc12d28e342193d027d947d6f49e6d03c141aa6337db0f8c0465dce8bbc2b diff --git a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch new file mode 100644 index 0000000..d4f9a7e --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch @@ -0,0 +1,12 @@ +diff -urN a/mozilla/nsprpub/config/nspr-config.in b/mozilla/nsprpub/config/nspr-config.in +--- a/mozilla/nsprpub/config/nspr-config.in 2012-03-06 07:13:39.000000000 -0600 ++++ b/mozilla/nsprpub/config/nspr-config.in 2013-02-16 20:53:53.893489345 -0600 +@@ -126,7 +126,7 @@ + fi + + if test "$echo_libs" = "yes"; then +- libdirs=-L$libdir ++ libdirs="" + if test -n "$lib_plds"; then + libdirs="$libdirs -lplds${major_version}" + fi diff --git a/dev-libs/nspr/nspr-4.9.5.ebuild b/dev-libs/nspr/nspr-4.9.5.ebuild index 233b0b1..f804802 100644 --- a/dev-libs/nspr/nspr-4.9.5.ebuild +++ b/dev-libs/nspr/nspr-4.9.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.2-r1.ebuild,v 1.1 2012/11/20 01:46:46 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.5.ebuild,v 1.1 2013/02/15 13:29:14 polynomial-c Exp $ EAPI=3 WANT_AUTOCONF="2.1" @@ -13,9 +13,9 @@ DESCRIPTION="Netscape Portable Runtime" HOMEPAGE="http://www.mozilla.org/projects/nspr/" SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~hppa ~ia64 ~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() { @@ -30,6 +30,8 @@ src_prepare() { #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch + # We do not need to pass -L$libdir via nspr-config --libs + epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch # We must run eautoconf to regenerate configure cd "${S}"/mozilla/nsprpub @@ -46,48 +48,47 @@ src_prepare() { src_configure() { cd "${S}"/build + # We use the standard BUILD_xxx but nspr uses HOST_xxx + tc-export_build_env BUILD_CC + export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} + tc-export AR CC CXX RANLIB + [[ ${CBUILD} != ${CHOST} ]] \ + && export CROSS_COMPILE=1 \ + || unset CROSS_COMPILE + + local myconf echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + ${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="${myconf} --enable-64bit";; + *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 - myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \ + # Ancient autoconf needs help finding the right tools. + LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \ + ac_cv_path_AR="${AR}" \ + econf \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ $(use_enable debug) \ $(use_enable !debug optimize) \ - ${myconf} || die "econf failed" + ${myconf} } src_compile() { cd "${S}"/build - if tc-is-cross-compiler; then - $(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/nsinstall.c \ - -o config/native-nsinstall || die "failed to build nsinstall" - $(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/now.c \ - -o config/native-now || die "failed to build now" - sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk - for d in pr/src lib/libc/src lib/ds; do - sed -s 's#/now$#/native-now#' -i ${d}/Makefile - done - fi - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "failed to build" + emake || die "failed to build" } -src_install () { +src_install() { # Their build system is royally confusing, as usual MINOR_VERSION=${MIN_PV} # Used for .so version cd "${S}"/build emake DESTDIR="${D}" install || die "emake install failed" cd "${ED}"/usr/$(get_libdir) - for file in *.a; do - einfo "removing static libraries as upstream has requested!" - rm -f ${file} || die "failed to remove static libraries." - done + einfo "removing static libraries as upstream has requested!" + rm -f *.a || die "failed to remove static libraries." local n= # aix-soname.patch does this already