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 3AD3B1381F3 for ; Sun, 25 Nov 2012 12:38:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19D22E0574; Sun, 25 Nov 2012 12:38:04 +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 6049EE0552 for ; Sun, 25 Nov 2012 12:38:03 +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 1887E33D97A for ; Sun, 25 Nov 2012 12:38:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 95CACE5444 for ; Sun, 25 Nov 2012 12:38:00 +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: <1353846992.7a0d2cde87cc58ebeb23a4a739777cbedd6907f7.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.1-x32_v0.2.patch dev-libs/nspr/nspr-4.9.2.ebuild dev-libs/nspr/nspr-4.9.4.ebuild X-VCS-Directories: dev-libs/nspr/files/ dev-libs/nspr/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 7a0d2cde87cc58ebeb23a4a739777cbedd6907f7 X-VCS-Branch: master Date: Sun, 25 Nov 2012 12:38:00 +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: 4c4ea043-10b8-4001-96a9-937d54067c61 X-Archives-Hash: 3753b5c91a5560ee60f43eaca80f530d commit: 7a0d2cde87cc58ebeb23a4a739777cbedd6907f7 Author: Jory A. Pratt gentoo org> AuthorDate: Sun Nov 25 12:36:32 2012 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Nov 25 12:36:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=7a0d2cde nspr version bump, fix bug #436200 --- dev-libs/nspr/Manifest | 5 +- dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch | 91 -------------------- .../nspr/{nspr-4.9.2.ebuild => nspr-4.9.4.ebuild} | 23 +++-- 3 files changed, 15 insertions(+), 104 deletions(-) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index a6d34f3..bf67391 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -8,6 +8,5 @@ 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.1-x32_v0.2.patch 2348 SHA256 2adf3138542bbb497776cb4349f87e093085f3ffec9b4b9845f18bd9dabbb648 SHA512 019e627936cfc644b472af82cf60a253e795574e5762f5464f7dff536fbbe471a576b791c5abf737aa2f91515865c7e9c0b936c59bd3753195257df0d43eb09c WHIRLPOOL 03a07fce0adfae840ab3d330d705eebbc114b3dfb28cbcbf6b2b15b20da3e4000e8a28284fb75275baecb876b2b3e3ba70fc6e1147b112c167e9f2f1bfc76b93 -DIST nspr-4.9.2.tar.gz 1172193 SHA256 570206f125fc31b8589b31d3837c190ee2a75d4f3b8faec2cbedbeacc016e82c SHA512 1f1f35fc2b9ead7e3b4ef93a02f13c0bcccc314bf9cfad67e6ddb755aaf6ab411499b0b57b94b032e2c7ee21fc7c114ca447e24825b79611f720f88eb37bd348 WHIRLPOOL b50c87f8ba77601ea79282659b4781fe674925bc87bc130dd5acc056021b135769a0d5ed1b76e759c1dfbb0c7df9d6fb0d97d292f42c5d7c5db43233c2498f07 -EBUILD nspr-4.9.2.ebuild 3658 SHA256 b7ab8a3619369edc5a672ffcf9b5d8ac4286a30ac22f669f7511f2d55b8f1a1b SHA512 6b46a01ced10230a6a91dde3f17d78342cba0097cb6ed556b66e7746d8e8566ee7902ea0055396e708b6da4bae868cb3c1f1bab162e64402e49ac50a17f5693d WHIRLPOOL d1eb961d672ca0efe0be3c7bade8affa511785968748385fec4ef49a7ea98ac62dc00be00811ff6a20671a07a04abb2d65ea00bb393e9c9cbb1a790aa3ff4e62 +DIST nspr-4.9.4.tar.gz 1160641 SHA256 749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4 SHA512 5c1caf290bbe6cec7fddd40ae1eefbe54608a0f6fce908b1680513c50661dde40f4c1638ddca56b8a7125b20be6945aa2b4507fa0dde09e3e9eb0b08e90cfe2b WHIRLPOOL a9fd7a0c4b17240c746312cdab1495a5d5ebcabcc945a7c2f1a3df435db2d4e5e80e3086d20bd658a94c573abb916611327ad877430c9cd0282e8d192217d707 +EBUILD nspr-4.9.4.ebuild 3703 SHA256 5a62bec1f789a9075c800ded7a69ba88b857bb5dbecd9b05f8873e7fae4cf3b2 SHA512 fa4938788153a0b4c310f632c2e8463c11b3a25e17c91d8e97f983deb143ec1f8ba2bb0f46b06414e4958d9701ba2df6682989a4ca407b80ccbeb2945da55a7f WHIRLPOOL 57469d41db55202d5bde477f64f182335cadd89419806a1056f29a2e9917c5e6b696e211ed38aa28182f7862f35aa39daa07c5f1f6c5837dd14407e12b2eb4a5 diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch deleted file mode 100644 index 6880141..0000000 --- a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch +++ /dev/null @@ -1,91 +0,0 @@ -# HG changeset patch -# Parent 6b1ef31834235cde5153f91a7443b29398b541d9 -# User Jory A. Pratt -Add initial support for x32 abi - -diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg ---- a/mozilla/nsprpub/pr/include/md/_linux.cfg -+++ b/mozilla/nsprpub/pr/include/md/_linux.cfg -@@ -207,16 +207,63 @@ - #define PR_ALIGN_OF_POINTER 8 - #define PR_ALIGN_OF_WORD 8 - - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - - #elif defined(__x86_64__) - -+#ifdef __ILP32__ -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#else -+ - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN - #define IS_64 - - #define PR_BYTES_PER_BYTE 1 - #define PR_BYTES_PER_SHORT 2 - #define PR_BYTES_PER_INT 4 - #define PR_BYTES_PER_INT64 8 -@@ -251,16 +298,18 @@ - #define PR_ALIGN_OF_FLOAT 4 - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - #define PR_ALIGN_OF_WORD 8 - - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#endif -+ - #elif defined(__mc68000__) - - #undef IS_LITTLE_ENDIAN - #define IS_BIG_ENDIAN 1 - - #define PR_BYTES_PER_BYTE 1 - #define PR_BYTES_PER_SHORT 2 - #define PR_BYTES_PER_INT 4 diff --git a/dev-libs/nspr/nspr-4.9.2.ebuild b/dev-libs/nspr/nspr-4.9.4.ebuild similarity index 78% rename from dev-libs/nspr/nspr-4.9.2.ebuild rename to dev-libs/nspr/nspr-4.9.4.ebuild index 3d4e3ca..5c82efc 100644 --- a/dev-libs/nspr/nspr-4.9.2.ebuild +++ b/dev-libs/nspr/nspr-4.9.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.1-r1.ebuild,v 1.1 2012/06/22 02:57:33 anarchy Exp $ +# $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 $ EAPI=3 WANT_AUTOCONF="2.1" @@ -31,7 +31,6 @@ 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 - epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.2.patch # We must run eautoconf to regenerate configure cd "${S}"/mozilla/nsprpub @@ -65,14 +64,18 @@ src_configure() { src_compile() { cd "${S}"/build - if tc-is-cross-compiler; then - emake CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" \ - -C config nsinstall || die "failed to build" - mv config/{,native-}nsinstall - sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk - rm config/nsinstall.o - fi - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to 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" } src_install () {