* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2012-01-10 2:09 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2012-01-10 2:09 UTC (permalink / raw
To: gentoo-commits
commit: b8aafbddbb42060486e236f2a6a0af7dcfbd8261
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 02:09:07 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 02:09:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=b8aafbdd
bug #365975, thanks dirtyepic for patch
---
dev-libs/nspr/Manifest | 3 +-
dev-libs/nspr/files/nspr-4.8.9-link-flags.patch | 28 ++++++++++++++++++++
.../{nspr-4.8.9.ebuild => nspr-4.8.9-r1.ebuild} | 1 +
3 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 695df1c..dacd575 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,5 +8,6 @@ AUX nspr-4.8-pkgconfig-gentoo-3.patch 4726 RMD160 c8e93e2a06b90d6e69a12dce4cfaba
AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9efc SHA1 7919b736f4ebe12d8067ba400325487c06df3d04 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f
AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa
AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab
+AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610
DIST nspr-4.8.9.tar.gz 1235265 RMD160 6c7089a9d798367b8d559e5dea8e732e73b47df2 SHA1 509785e68f52542778c770445329cc4db15c749b SHA256 ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce
-EBUILD nspr-4.8.9.ebuild 3559 RMD160 cb5afab90bc68ffaf93873228ee7914d4d89e82f SHA1 a74633357fea657dee06ede6acb79270c6f8e6e5 SHA256 d1b0c1abf7e2cbc8294a7303d09b827c7f78f934bf9e623182583ab8c0519b70
+EBUILD nspr-4.8.9-r1.ebuild 3610 RMD160 2a3690bf547e5b4043c290ab32041a47fab04b82 SHA1 fff7da0a569f3174f4486344c5f86a284dba1ab4 SHA256 54f47f3421fc6f1d9a210953ea493fb89943b9e8e844ff1b2fb9fc03276e4d00
diff --git a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
new file mode 100644
index 0000000..dd3b132
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
@@ -0,0 +1,28 @@
+Use CFLAGS when linking. Some flags can add functionality to generated
+code that requires extra libs to be linked in (eg. libgomp when using
+autoparallelization). Other flags are required when building and linking
+(eg. -flto).
+
+https://bugs.gentoo.org/365975
+
+--- a/mozilla/nsprpub/config/autoconf.mk.in
++++ b/mozilla/nsprpub/config/autoconf.mk.in
+@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@
+ DLLFLAGS = @DLLFLAGS@
+ EXEFLAGS = @EXEFLAGS@
+ OPTIMIZER = @OPTIMIZER@
++LD_CFLAGS = @CFLAGS@
+
+ PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
+ PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@
+--- a/mozilla/nsprpub/config/config.mk
++++ b/mozilla/nsprpub/config/config.mk
+@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
+ NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
+ $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
+
+-LDFLAGS = $(OS_LDFLAGS)
++LDFLAGS = $(LD_CFLAGS) $(OS_LDFLAGS)
+
+ # Enable profile-guided optimization
+ ifdef MOZ_PROFILE_GENERATE
diff --git a/dev-libs/nspr/nspr-4.8.9.ebuild b/dev-libs/nspr/nspr-4.8.9-r1.ebuild
similarity index 98%
rename from dev-libs/nspr/nspr-4.8.9.ebuild
rename to dev-libs/nspr/nspr-4.8.9-r1.ebuild
index b7963b4..e4ce0b1 100644
--- a/dev-libs/nspr/nspr-4.8.9.ebuild
+++ b/dev-libs/nspr/nspr-4.8.9-r1.ebuild
@@ -30,6 +30,7 @@ src_prepare() {
# Patch needs updating
#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
# make sure it won't find Perl out of Prefix
sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2012-02-21 0:24 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2012-02-21 0:24 UTC (permalink / raw
To: gentoo-commits
commit: 3357d03ccd901d753c910269732357d9e556a17d
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 00:24:27 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 00:24:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=3357d03c
version bump nspr to 4.9
---
dev-libs/nspr/Manifest | 6 +-
.../nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch | 126 --------------------
.../nspr/files/nspr-4.9-pkgconfig-gentoo.patch | 90 ++++++++++++++
.../nspr/{nspr-4.8.9-r1.ebuild => nspr-4.9.ebuild} | 25 ++---
4 files changed, 103 insertions(+), 144 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index dacd575..5dfb6ea 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -4,10 +4,10 @@ AUX nspr-4.7.0-prtime.patch 964 RMD160 a963c21fb1ce5e8913d3c41753ca37b24e80798d
AUX nspr-4.7.1-solaris.patch 516 RMD160 aaa024e1afabfae51a0060db328536e1a624ed3a SHA1 6766a9939830e8277f2342db806235ab2e30ab14 SHA256 e47a0abb5b106af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447
AUX nspr-4.7.4-solaris.patch 2011 RMD160 08060ba3885a1a659ad5a5505715ced0dd669d5f SHA1 9b0e2021e9dca56f741b505e5aa5ca56da47bbb1 SHA256 9e72078c941229e7112b4bc184e195821c9243bfb9411e9eeefcdb889866ff9f
AUX nspr-4.8-config.patch 1429 RMD160 1988289c042f97ad8c3681b7febbbea45a3de9a6 SHA1 0055fb2f27865e3bcc6d6a9e6f79b633443295d6 SHA256 7cb63ea677ad9c92dde4513b16258f092b463738cb145edd95dd671bcfaa2150
-AUX nspr-4.8-pkgconfig-gentoo-3.patch 4726 RMD160 c8e93e2a06b90d6e69a12dce4cfabaebf05b552b SHA1 5d4c67e7b3c0760fd8bb576b8623cbe967b01253 SHA256 f1197ff0f220425d38cae47667ea585cc999fb182cb5c13896e4449fde2d5b6d
AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9efc SHA1 7919b736f4ebe12d8067ba400325487c06df3d04 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f
AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa
AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab
AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610
-DIST nspr-4.8.9.tar.gz 1235265 RMD160 6c7089a9d798367b8d559e5dea8e732e73b47df2 SHA1 509785e68f52542778c770445329cc4db15c749b SHA256 ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce
-EBUILD nspr-4.8.9-r1.ebuild 3610 RMD160 2a3690bf547e5b4043c290ab32041a47fab04b82 SHA1 fff7da0a569f3174f4486344c5f86a284dba1ab4 SHA256 54f47f3421fc6f1d9a210953ea493fb89943b9e8e844ff1b2fb9fc03276e4d00
+AUX nspr-4.9-pkgconfig-gentoo.patch 3710 RMD160 c25988e23698df566f69618989eb864dd8bd8848 SHA1 c10e52de61057047a53d8a45f56e7ad901014b57 SHA256 1483506296818ffffbb292d28d336d37147154e5e3db35e7e07d37bb728e2253
+DIST nspr-4.9.tar.gz 1218528 RMD160 35298a4752aa657196b9d2f41ad46f1bef7e22a2 SHA1 57a6bb09ccb90d14303c3d9a6ec2592d8a5c0752 SHA256 ecc632bc578c125650999776673eeff952096afa6d151f6d91f6c3a93e1e716a
+EBUILD nspr-4.9.ebuild 3414 RMD160 ae521f48e8c134010880269198458df06a27dbb2 SHA1 a00a9e94300190c3f6ceb6ca1de5aa1866aa064b SHA256 ae702462d83c03ad51595d3e600e60978e137ff29a946f5216477a510035f5d0
diff --git a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch
deleted file mode 100644
index 2525928..0000000
--- a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk
---- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500
-@@ -162,3 +162,4 @@
- RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
- RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
- RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
-+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in
---- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500
-@@ -52,9 +52,10 @@
-
- # autoconf.mk must be deleted last (from the top-level directory)
- # because it is included by every makefile.
--DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config
-+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc
-
- RELEASE_BINS = nspr-config
-+RELEASE_PC = nspr.pc
-
- include $(topsrcdir)/config/config.mk
-
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in
---- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500
-@@ -92,13 +92,13 @@
-
- # Set variables that may be dependent upon other variables
- if test -z "$exec_prefix"; then
-- exec_prefix=@exec_prefix@
-+ exec_prefix=`pkg-config --variable=exec_prefix nspr`
- fi
- if test -z "$includedir"; then
-- includedir=@includedir@
-+ includedir=`pkg-config --variable=includedir nspr`
- fi
- if test -z "$libdir"; then
-- libdir=@libdir@
-+ libdir=`pkg-config --variable=libdir nspr`
- fi
-
- if test "$echo_prefix" = "yes"; then
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in
---- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600
-+++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSPR
-+Description: The Netscape Portable Runtime
-+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
-+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread -Wl,-R${libdir}
-+Cflags: -I${includedir}
-+
-diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk
---- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500
-@@ -211,7 +211,7 @@
- rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
- +$(LOOP_OVER_DIRS)
-
--install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
-+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC)
- ifdef RELEASE_BINS
- $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
- endif
-@@ -221,6 +221,9 @@
- ifdef RELEASE_LIBS
- $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
- endif
-+ifdef RELEASE_PC
-+ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/
-+endif
- +$(LOOP_OVER_DIRS)
-
- release:: export
-@@ -272,6 +275,23 @@
- fi
- cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST)
- endif
-+ifdef RELEASE_PC
-+ @echo "Copying pkg-config files to release directory"
-+ @if test -z "$(BUILD_NUMBER)"; then \
-+ echo "BUILD_NUMBER must be defined"; \
-+ false; \
-+ else \
-+ true; \
-+ fi
-+ @if test ! -d $(RELEASE_PC_DEST); then \
-+ rm -rf $(RELEASE_PC_DEST); \
-+ $(NSINSTALL) -D $(RELEASE_PC_DEST);\
-+ else \
-+ true; \
-+ fi
-+ cp $(RELEASE_PC) $(RELEASE_PC_DEST)
-+endif
-+
- +$(LOOP_OVER_DIRS)
-
- alltags:
-diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure
---- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500
-+++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500
-@@ -6037,6 +6037,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
-diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in
---- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500
-+++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500
-@@ -2871,6 +2871,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
diff --git a/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch b/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch
new file mode 100644
index 0000000..56d7bb8
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch
@@ -0,0 +1,90 @@
+diff -urN a/mozilla/nsprpub/config/config.mk b/mozilla/nsprpub/config/config.mk
+--- a/mozilla/nsprpub/config/config.mk 2011-10-13 09:00:06.000000000 -0500
++++ b/mozilla/nsprpub/config/config.mk 2012-02-20 17:52:11.364823693 -0600
+@@ -183,6 +183,7 @@
+ RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
+ RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
+ RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
++RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig
+
+ # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including
+ # this file
+diff -urN a/mozilla/nsprpub/config/Makefile.in b/mozilla/nsprpub/config/Makefile.in
+--- a/mozilla/nsprpub/config/Makefile.in 2009-03-03 16:04:23.000000000 -0600
++++ b/mozilla/nsprpub/config/Makefile.in 2012-02-20 17:53:06.490819923 -0600
+@@ -52,9 +52,10 @@
+
+ # autoconf.mk must be deleted last (from the top-level directory)
+ # because it is included by every makefile.
+-DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config
++DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc
+
+ RELEASE_BINS = nspr-config
++RELEASE_PC = nspr.pc
+
+ include $(topsrcdir)/config/config.mk
+
+diff -urN a/mozilla/nsprpub/config/nspr-config.in b/mozilla/nsprpub/config/nspr-config.in
+--- a/mozilla/nsprpub/config/nspr-config.in 2005-05-10 19:53:41.000000000 -0500
++++ b/mozilla/nsprpub/config/nspr-config.in 2012-02-20 17:55:10.947811413 -0600
+@@ -92,13 +92,13 @@
+
+ # Set variables that may be dependent upon other variables
+ if test -z "$exec_prefix"; then
+- exec_prefix=@exec_prefix@
++ exec_prefix=`pkg-config --variable=exec_prefix nspr`
+ fi
+ if test -z "$includedir"; then
+- includedir=@includedir@
++ includedir=`pkg-config --variable=includedir nspr`
+ fi
+ if test -z "$libdir"; then
+- libdir=@libdir@
++ libdir=`pkg-config --variable=libdir nspr`
+ fi
+
+ if test "$echo_prefix" = "yes"; then
+diff -urN a/mozilla/nsprpub/config/nspr.pc.in b/mozilla/nsprpub/config/nspr.pc.in
+--- a/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600
++++ b/mozilla/nsprpub/config/nspr.pc.in 2012-02-20 18:00:14.609790649 -0600
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSPR
++Description: The Netscape Portable Runtime
++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
++Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@
++Cflags: -I@includedir@
+diff -urN a/mozilla/nsprpub/config/rules.mk b/mozilla/nsprpub/config/rules.mk
+--- a/mozilla/nsprpub/config/rules.mk 2011-08-29 12:02:51.000000000 -0500
++++ b/mozilla/nsprpub/config/rules.mk 2012-02-20 18:11:56.112742680 -0600
+@@ -207,10 +207,14 @@
+ rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
+ +$(LOOP_OVER_DIRS)
+
+-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
++install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC)
+ ifdef RELEASE_BINS
+ $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
+ endif
++ifdef RELEASE_PC
++ $(NSINSTALL) -D $(DESTDIR)$(libdir)/pkgconfig
++ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/
++endif
+ ifdef RELEASE_HEADERS
+ $(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
+ endif
+diff -urN a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in
+--- a/mozilla/nsprpub/configure.in 2012-02-14 13:06:00.000000000 -0600
++++ b/mozilla/nsprpub/configure.in 2012-02-20 18:09:55.776750908 -0600
+@@ -3357,6 +3357,7 @@
+ config/nsprincl.mk
+ config/nsprincl.sh
+ config/nspr-config
++ config/nspr.pc
+ lib/Makefile
+ lib/ds/Makefile
+ lib/libc/Makefile
diff --git a/dev-libs/nspr/nspr-4.8.9-r1.ebuild b/dev-libs/nspr/nspr-4.9.ebuild
similarity index 85%
rename from dev-libs/nspr/nspr-4.8.9-r1.ebuild
rename to dev-libs/nspr/nspr-4.9.ebuild
index e4ce0b1..ae1792a 100644
--- a/dev-libs/nspr/nspr-4.8.9-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.9.ebuild
@@ -3,8 +3,9 @@
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.8.ebuild,v 1.1 2011/05/13 21:13:30 anarchy Exp $
EAPI=3
+WANT_AUTOCONF="2.1"
-inherit eutils multilib toolchain-funcs versionator
+inherit autotools eutils multilib toolchain-funcs versionator
MIN_PV="$(get_version_component_range 2)"
@@ -23,7 +24,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
- epatch "${FILESDIR}"/${PN}-4.8-pkgconfig-gentoo-3.patch
+ epatch "${FILESDIR}"/${PN}-4.9-pkgconfig-gentoo.patch
epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
@@ -31,12 +32,17 @@ 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 must run eautoconf to regenerate configure
+ cd ${S}/mozilla/nsprpub
+ eautoconf
+
# make sure it won't find Perl out of Prefix
- sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die
+ sed -i -e "s/perl5//g" ${S}/mozilla/nsprpub/configure || die
# Respect LDFLAGS
sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- mozilla/nsprpub/config/rules.mk
+ ${S}/mozilla/nsprpub/config/rules.mk || die
}
src_configure() {
@@ -90,17 +96,6 @@ src_install () {
# install nspr-config
dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"
- # create pkg-config file
- insinto /usr/$(get_libdir)/pkgconfig/
- doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file"
-
# Remove stupid files in /usr/bin
rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
}
-
-pkg_postinst() {
- ewarn
- ewarn "Please make sure you run revdep-rebuild after upgrade."
- ewarn "This is *extremely* important to ensure your system nspr works properly."
- ewarn
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2012-06-22 0:50 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2012-06-22 0:50 UTC (permalink / raw
To: gentoo-commits
commit: 7d9b4acf8af33007bf79448ac5c5c1126e8a5700
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 00:49:48 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 00:49:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=7d9b4acf
add x32 support to nspr
---
dev-libs/nspr/Manifest | 3 +-
dev-libs/nspr/files/nspr-4.9.1-x32.patch | 68 ++++++++++++++++++++
.../{nspr-4.9.1.ebuild => nspr-4.9.1-r1.ebuild} | 1 +
3 files changed, 71 insertions(+), 1 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 683f7b0..009784c 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,5 +8,6 @@ AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9ef
AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa
AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab
AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610
+AUX nspr-4.9.1-x32.patch 1799 RMD160 3bd442b2be01d5031aac2340d0584359cc6f3cdc SHA1 d8772443f935e3ffa0dd6a8be89710ae81295dae SHA256 629e013fbe7968d69e3bb0ccd43a3538ce0b649e3238cca89daf84116acae446
DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17
-EBUILD nspr-4.9.1.ebuild 3651 RMD160 d13d12a0eb5cfbef63687930bf5110c405752b6f SHA1 92b4ac2a96ad4e9bf62de3d941fc7abdf409fdda SHA256 9f33a59933a14448b22273d37cae80dc39bb98a76d8451968dbbcd531b4b253f
+EBUILD nspr-4.9.1-r1.ebuild 3695 RMD160 fed9c53ee5df774ac44f6c2a478c24c9f43707da SHA1 07d4f33295c04d4e848b2816c431933d1ab88229 SHA256 99e4490cffae470d6d948435b59ae27098870a35d046a0346842744b800c1a78
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32.patch b/dev-libs/nspr/files/nspr-4.9.1-x32.patch
new file mode 100644
index 0000000..dd7a8be
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.9.1-x32.patch
@@ -0,0 +1,68 @@
+diff -urN a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg
+--- a/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-05-18 16:55:29.000000000 -0500
++++ b/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-06-21 15:10:35.397358851 -0500
+@@ -211,7 +211,7 @@
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
+ #elif defined(__x86_64__)
+-
++#ifdef __LP64__
+ #define IS_LITTLE_ENDIAN 1
+ #undef IS_BIG_ENDIAN
+ #define IS_64
+@@ -256,6 +256,54 @@
+ #define PR_BYTES_PER_WORD_LOG2 3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
++#else
++
++
++#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
++
++#endif
++
+ #elif defined(__mc68000__)
+
+ #undef IS_LITTLE_ENDIAN
+
diff --git a/dev-libs/nspr/nspr-4.9.1.ebuild b/dev-libs/nspr/nspr-4.9.1-r1.ebuild
similarity index 98%
rename from dev-libs/nspr/nspr-4.9.1.ebuild
rename to dev-libs/nspr/nspr-4.9.1-r1.ebuild
index cddaeee..de71a1a 100644
--- a/dev-libs/nspr/nspr-4.9.1.ebuild
+++ b/dev-libs/nspr/nspr-4.9.1-r1.ebuild
@@ -31,6 +31,7 @@ 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.patch
# We must run eautoconf to regenerate configure
cd "${S}"/mozilla/nsprpub
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2012-06-24 3:31 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2012-06-24 3:31 UTC (permalink / raw
To: gentoo-commits
commit: e72990d448085791452898371505d232d7ee918a
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 03:31:12 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 03:31:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=e72990d4
Fix x32 patch force update to fix undefined references.
---
dev-libs/nspr/Manifest | 4 +-
dev-libs/nspr/files/nspr-4.9.1-x32.patch | 107 -------------
dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch | 156 ++++++++++++++++++++
.../{nspr-4.9.1-r1.ebuild => nspr-4.9.1-r2.ebuild} | 2 +-
4 files changed, 159 insertions(+), 110 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index f47ab4b..180b4db 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,6 +8,6 @@ AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9ef
AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa
AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab
AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610
-AUX nspr-4.9.1-x32.patch 3199 RMD160 c309585536472c3de43f465666c63fecc640c254 SHA1 9499a952f638872f686d31b6a12d5e9c196cab9d SHA256 bf996243de2e024ca6c12eb37ea51c59075bf58718e004b5ea663cf0b58a5738
+AUX nspr-4.9.1-x32_v0.1.patch 4930 RMD160 fcc0bbfdcddb1f9bddbb89307b688e226263622b SHA1 3e80fe9b56eecd3fc838d641870d0bf7d92a1e0c SHA256 a12bb9c20e2d888ef227bc98624133059068f79c2cf4a0b5ee26d43b05852e7f
DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17
-EBUILD nspr-4.9.1-r1.ebuild 3698 RMD160 973f4db9bf307d78bbea0282c523cbd28ff52fd9 SHA1 cbdef5b02c74ded9ece6ad75d82ae33a8a8778e3 SHA256 3ea29134d0a928148e370cf8e04cc2673c67d7c50714455b51beef60cded3bce
+EBUILD nspr-4.9.1-r2.ebuild 3703 RMD160 138621f81b9c7a0871d581d9b78419e9adaccdf7 SHA1 09d720b08f69add1d2f416f7071282ba848385d5 SHA256 99e83842eee5deb42b975ba8b436655f6d3224ba1dee1fcc0a9bbbf1715a3a25
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32.patch b/dev-libs/nspr/files/nspr-4.9.1-x32.patch
deleted file mode 100644
index a44e9e7..0000000
--- a/dev-libs/nspr/files/nspr-4.9.1-x32.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -urN a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg
---- a/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-05-18 16:55:29.000000000 -0500
-+++ b/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-06-21 15:10:35.397358851 -0500
-@@ -211,7 +211,7 @@
- #define PR_BYTES_PER_DWORD_LOG2 3
-
- #elif defined(__x86_64__)
--
-+#ifdef __LP64__
- #define IS_LITTLE_ENDIAN 1
- #undef IS_BIG_ENDIAN
- #define IS_64
-@@ -256,6 +256,54 @@
- #define PR_BYTES_PER_WORD_LOG2 3
- #define PR_BYTES_PER_DWORD_LOG2 3
-
-+#else
-+
-+
-+#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
-+
-+#endif
-+
- #elif defined(__mc68000__)
-
- #undef IS_LITTLE_ENDIAN
-diff -urN a/mozilla/nsprpub/pr/include/md/_linux.h b/mozilla/nsprpub/pr/include/md/_linux.h
---- a/mozilla/nsprpub/pr/include/md/_linux.h 2012-06-20 12:02:07.401308346 +0000
-+++ b/mozilla/nsprpub/pr/include/md/_linux.h 2012-06-20 12:31:44.113394683 +0000
-@@ -27,7 +27,7 @@
- #define _PR_SI_ARCHITECTURE "alpha"
- #elif defined(__ia64__)
- #define _PR_SI_ARCHITECTURE "ia64"
--#elif defined(__x86_64__)
-+#elif defined(__x86_64__) && !defined(__ILP32__)
- #define _PR_SI_ARCHITECTURE "x86-64"
- #elif defined(__mc68000__)
- #define _PR_SI_ARCHITECTURE "m68k"
-@@ -35,7 +35,7 @@
- #define _PR_SI_ARCHITECTURE "sparc64"
- #elif defined(__sparc__)
- #define _PR_SI_ARCHITECTURE "sparc"
--#elif defined(__i386__)
-+#elif defined(__i386__) || (defined(__x86_64__) && defined(__ILP32__))
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__mips__)
- #define _PR_SI_ARCHITECTURE "mips"
-@@ -78,7 +78,7 @@
- #define _PR_HAVE_SOCKADDR_LEN
- #endif
-
--#if defined(__i386__)
-+#if defined(__i386__) || (defined(__x86_64__) && defined(__ILP32__))
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
-@@ -104,7 +104,7 @@
- #define _MD_ATOMIC_SET _PR_ia64_AtomicSet
- #endif
-
--#if defined(__x86_64__)
-+#if defined(__x86_64__) && !defined(__ILP32__)
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
-
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
new file mode 100644
index 0000000..3de2a0f
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
@@ -0,0 +1,156 @@
+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
+@@ -206,17 +206,17 @@
+ #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
+
+ #elif defined(__x86_64__)
+-
++#ifdef __LP64__
+ #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 +251,64 @@
+ #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
+
++#else
++
++
++#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
++
++#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/mozilla/nsprpub/pr/include/md/_linux.h b/mozilla/nsprpub/pr/include/md/_linux.h
+--- a/mozilla/nsprpub/pr/include/md/_linux.h
++++ b/mozilla/nsprpub/pr/include/md/_linux.h
+@@ -22,25 +22,25 @@
+ #ifdef __powerpc64__
+ #define _PR_SI_ARCHITECTURE "ppc64"
+ #elif defined(__powerpc__)
+ #define _PR_SI_ARCHITECTURE "ppc"
+ #elif defined(__alpha)
+ #define _PR_SI_ARCHITECTURE "alpha"
+ #elif defined(__ia64__)
+ #define _PR_SI_ARCHITECTURE "ia64"
+-#elif defined(__x86_64__)
++#elif defined(__x86_64__) && defined(__LP64__)
+ #define _PR_SI_ARCHITECTURE "x86-64"
+ #elif defined(__mc68000__)
+ #define _PR_SI_ARCHITECTURE "m68k"
+ #elif defined(__sparc__) && defined(__arch64__)
+ #define _PR_SI_ARCHITECTURE "sparc64"
+ #elif defined(__sparc__)
+ #define _PR_SI_ARCHITECTURE "sparc"
+-#elif defined(__i386__)
++#elif defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
+ #define _PR_SI_ARCHITECTURE "x86"
+ #elif defined(__mips__)
+ #define _PR_SI_ARCHITECTURE "mips"
+ #elif defined(__arm__)
+ #define _PR_SI_ARCHITECTURE "arm"
+ #elif defined(__hppa__)
+ #define _PR_SI_ARCHITECTURE "hppa"
+ #elif defined(__s390x__)
+@@ -73,17 +73,17 @@
+ #if defined(ANDROID)
+ #define NO_DLOPEN_NULL
+ #endif
+
+ #ifdef __FreeBSD_kernel__
+ #define _PR_HAVE_SOCKADDR_LEN
+ #endif
+
+-#if defined(__i386__)
++#if defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT _PR_x86_AtomicIncrement
+ extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT _PR_x86_AtomicDecrement
+ extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD _PR_x86_AtomicAdd
+@@ -99,17 +99,17 @@ extern PRInt32 _PR_ia64_AtomicIncrement(
+ extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT _PR_ia64_AtomicDecrement
+ extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD _PR_ia64_AtomicAdd
+ extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ #define _MD_ATOMIC_SET _PR_ia64_AtomicSet
+ #endif
+
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && defined(__LP64__)
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT _PR_x86_64_AtomicIncrement
+ extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT _PR_x86_64_AtomicDecrement
+ extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD _PR_x86_64_AtomicAdd
diff --git a/dev-libs/nspr/nspr-4.9.1-r1.ebuild b/dev-libs/nspr/nspr-4.9.1-r2.ebuild
similarity index 98%
rename from dev-libs/nspr/nspr-4.9.1-r1.ebuild
rename to dev-libs/nspr/nspr-4.9.1-r2.ebuild
index 3ba6659..9f1bf05 100644
--- a/dev-libs/nspr/nspr-4.9.1-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.9.1-r2.ebuild
@@ -31,7 +31,7 @@ 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.patch
+ epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.1.patch
# We must run eautoconf to regenerate configure
cd "${S}"/mozilla/nsprpub
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2012-07-21 1:57 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2012-07-21 1:57 UTC (permalink / raw
To: gentoo-commits
commit: 076d716e3adcd037b23def8deeb7335e52bdd2f8
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 01:56:27 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 01:56:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=076d716e
Rework nspr x32 support
---
dev-libs/nspr/Manifest | 26 ++--
dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch | 156 --------------------
dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch | 91 ++++++++++++
.../{nspr-4.9.1-r2.ebuild => nspr-4.9.1-r3.ebuild} | 10 +-
4 files changed, 109 insertions(+), 174 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 180b4db..fe12f1d 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,13 +1,13 @@
-AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6
-AUX nspr-4.6.1-lang.patch 1718 RMD160 6c3fb440f4b4004289de3f65b996936bcfcbaa45 SHA1 a5ae7b8c95204279fbcb1ac46a242448aa5a894d SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b099b8d04035ecc937cd35fb
-AUX nspr-4.7.0-prtime.patch 964 RMD160 a963c21fb1ce5e8913d3c41753ca37b24e80798d SHA1 b47ffa12022ea83b738e5d847e61cca026ec7f07 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7
-AUX nspr-4.7.1-solaris.patch 516 RMD160 aaa024e1afabfae51a0060db328536e1a624ed3a SHA1 6766a9939830e8277f2342db806235ab2e30ab14 SHA256 e47a0abb5b106af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447
-AUX nspr-4.7.4-solaris.patch 2011 RMD160 08060ba3885a1a659ad5a5505715ced0dd669d5f SHA1 9b0e2021e9dca56f741b505e5aa5ca56da47bbb1 SHA256 9e72078c941229e7112b4bc184e195821c9243bfb9411e9eeefcdb889866ff9f
-AUX nspr-4.8-config.patch 1429 RMD160 1988289c042f97ad8c3681b7febbbea45a3de9a6 SHA1 0055fb2f27865e3bcc6d6a9e6f79b633443295d6 SHA256 7cb63ea677ad9c92dde4513b16258f092b463738cb145edd95dd671bcfaa2150
-AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9efc SHA1 7919b736f4ebe12d8067ba400325487c06df3d04 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f
-AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa
-AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab
-AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610
-AUX nspr-4.9.1-x32_v0.1.patch 4930 RMD160 fcc0bbfdcddb1f9bddbb89307b688e226263622b SHA1 3e80fe9b56eecd3fc838d641870d0bf7d92a1e0c SHA256 a12bb9c20e2d888ef227bc98624133059068f79c2cf4a0b5ee26d43b05852e7f
-DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17
-EBUILD nspr-4.9.1-r2.ebuild 3703 RMD160 138621f81b9c7a0871d581d9b78419e9adaccdf7 SHA1 09d720b08f69add1d2f416f7071282ba848385d5 SHA256 99e83842eee5deb42b975ba8b436655f6d3224ba1dee1fcc0a9bbbf1715a3a25
+AUX nspr-4.6.1-config-1.patch 565 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 SHA512 3556cff96d3e773d6e1762d94b9c325207578e4e910d33464c26b2084f42f2162c5fbb12d8f2206dbe4c5a7ecb1c8c63a699f08bd1b31c5b71eb73d257c46be6 WHIRLPOOL 7c249f1465f65da765b37b256d9cd8c8cef7d5fc7cb8a57f40f29a98cb2247cc3e1ec002f106d50bc531cfc6a8c9de5a85d6f522ad5b8f6e956fc0790d5993b4
+AUX nspr-4.6.1-lang.patch 1718 SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b099b8d04035ecc937cd35fb SHA512 ee23a7fffb36e8ea10fe029dcd2fa374eb397fb038c628d9140f20c9a6267dd2ee4f76fb02ec79698fae4a1493fe58b7b4f28795afd54cb868ef6fce276cf291 WHIRLPOOL 56ad48b4d75cc624382a60d783e36dfaf2c6fc5195f300710a35fa7a058ea4b0f5904e7d6de361e5f340116531c824cd86175dc80e52efbc04f5ded92e592ce9
+AUX nspr-4.7.0-prtime.patch 964 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7 SHA512 f8e09dda87e1d4a226fcf48ebc2cdfb20e67c351ffd227603b150636b19df49471ca0c617005e515ccee715df248363ed2e2162563ea6bce978e8607b6aba001 WHIRLPOOL 0090d17ebc287a39d18dbe531dc31522601ce4fc32ddd9a45bd9024987c328aa9fab7c7606673a1220c9b8602ee76c7f58bd7c4d3d639e8edb356d4d0efbd32e
+AUX nspr-4.7.1-solaris.patch 516 SHA256 e47a0abb5b106af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447 SHA512 864b842e77353b29f7d0b44cdd64d1a0f613fafa2d074f10adc30a1f1c2b69c5270646c25faa64a7b072e3f7d0f68134fe23eeaafd7bdf46d12f889074a8ef78 WHIRLPOOL b2caa24d39bb372a184a60f1a775d6787b6d6aec65db5d32772de5c70953b4a53ab6244b569bd5c1da63f5a6e00a7a50da6bd7e807085e3f3483aa90810ffe64
+AUX nspr-4.7.4-solaris.patch 2011 SHA256 9e72078c941229e7112b4bc184e195821c9243bfb9411e9eeefcdb889866ff9f SHA512 ff8b6403470e9eec401eafb33b109a850ca72e3b6e05e31514e68e9b0ca77aaf7dc0e8062f45406f5abd96671d3c352d9690b8da09454555929422a86d9c4fd4 WHIRLPOOL ea7a6543f474ccd45cfd6448d75ebf17057d9952fdb6d7610ad33603e94bcce0fe1c60b07d80570e49d35c0828748f239aacdce588514aeae472927fecaa8490
+AUX nspr-4.8-config.patch 1429 SHA256 7cb63ea677ad9c92dde4513b16258f092b463738cb145edd95dd671bcfaa2150 SHA512 0180b026a89080c557ff39496f015195127343319d054904274fa118c4394b567b1e79bf72ddffe4d6ce821b831a72926fc40a55897976a6cdaee0cea52d070b WHIRLPOOL 1f31f98e552a771a77acd731b4e071386aad4a94c71d638f6074224f0f79eb8f4f49763ded4282d910f2a7fea8c05000c1428b7d895c8204a2982775022b42d3
+AUX nspr-4.8.3-aix-gcc.patch 3673 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f SHA512 08a1625bb4ca7263e9f98289355e6def516e4b31a4bc856e75686a808575f2603056490b6b5dd6f33e616923c6e035cafec89ff86bcc4b9ceb0b9a5c10334f48 WHIRLPOOL f42200ebdd0ac5b6739c61a2673345a63a33eb1b9d0c471d6700c5b9f7a305a3a518d0d0715041e3aedb80a923e6ff183d035da151c0c51457a2e628317887ea
+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.1.tar.gz 1172951 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17 SHA512 b7613eb5f97d9d8d0254d454fb516a672664fbf46b34eb03cc51a9b3af11d8cbdc117691c068f8e64a8255aadfd28b2814eda53edcd97a643b26b94b5adec341 WHIRLPOOL 9df74a88ea050d0fb2ff8f8a38d703c2bd77f6ecc4c5e6fe09c240bf9f99266ba56083aed566ea2e0a1df7afdb090861dbe6b45725906af5979242f9b2a82161
+EBUILD nspr-4.9.1-r3.ebuild 3697 SHA256 f5b8bfb9f1be78d004755ed1302f8996df15c0fd13ac62095b13b78aa0e942c0 SHA512 cea9bba36807ec7d88a6faf83db985177db27ed11a00940e1a1058ce1101e1600aca7b8c58ea593ad6c6d2ca0d256b4bea008f6084525545037685089a19c2d9 WHIRLPOOL 5989ba5eb442609530572d3ed71a109edef08819c2b9868e4fc2a167e1d42b2d9e7052c91f20c784baed379cb30490a6a0bdf001a3eb3e17cced308e92b71416
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
deleted file mode 100644
index 3de2a0f..0000000
--- a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-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
-@@ -206,17 +206,17 @@
- #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
-
- #elif defined(__x86_64__)
--
-+#ifdef __LP64__
- #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 +251,64 @@
- #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
-
-+#else
-+
-+
-+#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
-+
-+#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/mozilla/nsprpub/pr/include/md/_linux.h b/mozilla/nsprpub/pr/include/md/_linux.h
---- a/mozilla/nsprpub/pr/include/md/_linux.h
-+++ b/mozilla/nsprpub/pr/include/md/_linux.h
-@@ -22,25 +22,25 @@
- #ifdef __powerpc64__
- #define _PR_SI_ARCHITECTURE "ppc64"
- #elif defined(__powerpc__)
- #define _PR_SI_ARCHITECTURE "ppc"
- #elif defined(__alpha)
- #define _PR_SI_ARCHITECTURE "alpha"
- #elif defined(__ia64__)
- #define _PR_SI_ARCHITECTURE "ia64"
--#elif defined(__x86_64__)
-+#elif defined(__x86_64__) && defined(__LP64__)
- #define _PR_SI_ARCHITECTURE "x86-64"
- #elif defined(__mc68000__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__sparc__) && defined(__arch64__)
- #define _PR_SI_ARCHITECTURE "sparc64"
- #elif defined(__sparc__)
- #define _PR_SI_ARCHITECTURE "sparc"
--#elif defined(__i386__)
-+#elif defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__mips__)
- #define _PR_SI_ARCHITECTURE "mips"
- #elif defined(__arm__)
- #define _PR_SI_ARCHITECTURE "arm"
- #elif defined(__hppa__)
- #define _PR_SI_ARCHITECTURE "hppa"
- #elif defined(__s390x__)
-@@ -73,17 +73,17 @@
- #if defined(ANDROID)
- #define NO_DLOPEN_NULL
- #endif
-
- #ifdef __FreeBSD_kernel__
- #define _PR_HAVE_SOCKADDR_LEN
- #endif
-
--#if defined(__i386__)
-+#if defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT _PR_x86_AtomicIncrement
- extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT _PR_x86_AtomicDecrement
- extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD _PR_x86_AtomicAdd
-@@ -99,17 +99,17 @@ extern PRInt32 _PR_ia64_AtomicIncrement(
- extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT _PR_ia64_AtomicDecrement
- extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD _PR_ia64_AtomicAdd
- extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
- #define _MD_ATOMIC_SET _PR_ia64_AtomicSet
- #endif
-
--#if defined(__x86_64__)
-+#if defined(__x86_64__) && defined(__LP64__)
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
- #define _MD_ATOMIC_INCREMENT _PR_x86_64_AtomicIncrement
- extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
- #define _MD_ATOMIC_DECREMENT _PR_x86_64_AtomicDecrement
- extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD _PR_x86_64_AtomicAdd
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
new file mode 100644
index 0000000..6880141
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch
@@ -0,0 +1,91 @@
+# HG changeset patch
+# Parent 6b1ef31834235cde5153f91a7443b29398b541d9
+# User Jory A. Pratt <anarchy@gentoo.org>
+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.1-r2.ebuild b/dev-libs/nspr/nspr-4.9.1-r3.ebuild
similarity index 93%
rename from dev-libs/nspr/nspr-4.9.1-r2.ebuild
rename to dev-libs/nspr/nspr-4.9.1-r3.ebuild
index 9f1bf05..fabd0ac 100644
--- a/dev-libs/nspr/nspr-4.9.1-r2.ebuild
+++ b/dev-libs/nspr/nspr-4.9.1-r3.ebuild
@@ -31,7 +31,7 @@ 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.1.patch
+ epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.2.patch
# We must run eautoconf to regenerate configure
cd "${S}"/mozilla/nsprpub
@@ -50,12 +50,12 @@ src_configure() {
echo > "${T}"/test.c
$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
- case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in
- ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";;
- ELFCLASS32*|POWERPC*|I386*|ARM*) ;;
+ case $(file "${T}"/test.o) in
+ *32-bit*x86-64*) myconf="${myconf} --enable-64bit";;
+ *64-bit*|*ppc64*|*x86_64*) myconf="${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 \
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2012-11-25 12:38 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2012-11-25 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 7a0d2cde87cc58ebeb23a4a739777cbedd6907f7
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 12:36:32 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> 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 <anarchy@gentoo.org>
-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 () {
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2013-02-17 2:59 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2013-02-17 2:59 UTC (permalink / raw
To: gentoo-commits
commit: 89b9f49f9d37ee1dc43db18c0bc87ddd9189e06b
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 02:59:04 2013 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> 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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2013-03-11 16:04 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2013-03-11 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 474e36d7e514fe89313b35c342b7365a82d72295
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 16:03:56 2013 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 16:03:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=474e36d7
nspr - drop nspr-4.6.1-config-1.patch
---
dev-libs/nspr/Manifest | 3 +--
dev-libs/nspr/files/nspr-4.6.1-config-1.patch | 11 -----------
dev-libs/nspr/nspr-4.9.5.ebuild | 1 -
3 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 450187b..c99b583 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,4 +1,3 @@
-AUX nspr-4.6.1-config-1.patch 565 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 SHA512 3556cff96d3e773d6e1762d94b9c325207578e4e910d33464c26b2084f42f2162c5fbb12d8f2206dbe4c5a7ecb1c8c63a699f08bd1b31c5b71eb73d257c46be6 WHIRLPOOL 7c249f1465f65da765b37b256d9cd8c8cef7d5fc7cb8a57f40f29a98cb2247cc3e1ec002f106d50bc531cfc6a8c9de5a85d6f522ad5b8f6e956fc0790d5993b4
AUX nspr-4.6.1-lang.patch 1718 SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b099b8d04035ecc937cd35fb SHA512 ee23a7fffb36e8ea10fe029dcd2fa374eb397fb038c628d9140f20c9a6267dd2ee4f76fb02ec79698fae4a1493fe58b7b4f28795afd54cb868ef6fce276cf291 WHIRLPOOL 56ad48b4d75cc624382a60d783e36dfaf2c6fc5195f300710a35fa7a058ea4b0f5904e7d6de361e5f340116531c824cd86175dc80e52efbc04f5ded92e592ce9
AUX nspr-4.7.0-prtime.patch 964 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7 SHA512 f8e09dda87e1d4a226fcf48ebc2cdfb20e67c351ffd227603b150636b19df49471ca0c617005e515ccee715df248363ed2e2162563ea6bce978e8607b6aba001 WHIRLPOOL 0090d17ebc287a39d18dbe531dc31522601ce4fc32ddd9a45bd9024987c328aa9fab7c7606673a1220c9b8602ee76c7f58bd7c4d3d639e8edb356d4d0efbd32e
AUX nspr-4.7.1-solaris.patch 516 SHA256 e47a0abb5b106af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447 SHA512 864b842e77353b29f7d0b44cdd64d1a0f613fafa2d074f10adc30a1f1c2b69c5270646c25faa64a7b072e3f7d0f68134fe23eeaafd7bdf46d12f889074a8ef78 WHIRLPOOL b2caa24d39bb372a184a60f1a775d6787b6d6aec65db5d32772de5c70953b4a53ab6244b569bd5c1da63f5a6e00a7a50da6bd7e807085e3f3483aa90810ffe64
@@ -9,4 +8,4 @@ AUX nspr-4.8.4-darwin-install_name.patch 1102 SHA256 ca17efc9a60f4372b5da9c29ddf
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 3718 SHA256 fd15bb2b861aefc145b85dbc019bad8ed3980a0ad043b5f6c9ce9284da7ab7e4 SHA512 ff9f172522407cbd2bd5cbe2e6585dac4ccce363b318d4fc85bd0e63916882b530b2f4bbf130e868cf4facdc49509fcfb4f6fd71ebe60b6618fd93a0d4217178 WHIRLPOOL dd4e41735de404f5fd45c8ba4a746958831f1f2454455ef3fa044a7aace18d0f577fc12d28e342193d027d947d6f49e6d03c141aa6337db0f8c0465dce8bbc2b
+EBUILD nspr-4.9.5.ebuild 3669 SHA256 bb49490931beacfa54ca8ebb6992102d4e03cb6bbf4bcac8154d2d04816d254e SHA512 94e8c9134bbfb5655d264fdac1c5587892d858f5179fab7e46889fff15f07f75b6398aa9d20fc320071c8f31ba2fe3baa8aeed7153de464568fed37e0e41b030 WHIRLPOOL 0c42348cade36f9864d36276e2932d1ebc7c0459f91116f8a9335513a5ea637c9dbbdc9cdf20d0737ffe53caeface5d4306e41a640a6093973d39324444a5351
diff --git a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch b/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
deleted file mode 100644
index a7d5361..0000000
--- a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/nsprpub/configure.orig 2006-01-14 22:41:37.000000000 +0000
-+++ mozilla/nsprpub/configure 2006-01-14 22:49:14.000000000 +0000
-@@ -3893,7 +3893,7 @@
- PR_MD_CSRCS=linux.c
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)'
- _OPTIMIZE_FLAGS=-O2
- _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that
- # combo is not yet good at debugging inlined
diff --git a/dev-libs/nspr/nspr-4.9.5.ebuild b/dev-libs/nspr/nspr-4.9.5.ebuild
index f804802..c835eaa 100644
--- a/dev-libs/nspr/nspr-4.9.5.ebuild
+++ b/dev-libs/nspr/nspr-4.9.5.ebuild
@@ -20,7 +20,6 @@ IUSE="debug"
src_prepare() {
mkdir build inst
- epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2014-06-12 15:22 Ian Stakenvicius
0 siblings, 0 replies; 15+ messages in thread
From: Ian Stakenvicius @ 2014-06-12 15:22 UTC (permalink / raw
To: gentoo-commits
commit: f6ba6b14003f69da3a906f2bb302919237af9c91
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 15:22:21 2014 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 15:22:21 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f6ba6b14
version bump, and multilib eclass support
---
dev-libs/nspr/Manifest | 1 +
dev-libs/nspr/files/nspr-4.10.6-solaris.patch | 32 ++++++++++
dev-libs/nspr/nspr-4.10.6.ebuild | 92 +++++++++++++++++++++++++++
3 files changed, 125 insertions(+)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 0f12480..e376918 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1 +1,2 @@
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/files/nspr-4.10.6-solaris.patch b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
new file mode 100644
index 0000000..3ae8052
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
@@ -0,0 +1,32 @@
+* drop Solaris linker stuff
+
+--- nspr-4.7.4/mozilla/nsprpub/configure.in
++++ nspr-4.7.4/mozilla/nsprpub/configure.in
+@@ -1988,26 +1988,14 @@
+ CPU_ARCH=`uname -p`
+ MDCPUCFG_H=_solaris.cfg
+ PR_MD_CSRCS=solaris.c
+- LD=/usr/ccs/bin/ld
+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ RESOLVE_LINK_SYMBOLS=1
+- case "${OS_RELEASE}" in
+- 5.8|5.9)
+- ;;
+- *)
+- # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
+- USE_B_DIRECT=1
+- ;;
+- esac
+ if test -n "$GNU_CC"; then
+ DSO_CFLAGS=-fPIC
+ if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
+ GCC_USE_GNU_LD=1
+ fi
+- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore'
+- if test -n "$USE_B_DIRECT"; then
+- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
+- fi
++ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
+ else
+ DSO_CFLAGS=-KPIC
+ DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
diff --git a/dev-libs/nspr/nspr-4.10.6.ebuild b/dev-libs/nspr/nspr-4.10.6.ebuild
new file mode 100644
index 0000000..9266a4d
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.10.6.ebuild
@@ -0,0 +1,92 @@
+# 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 $
+
+EAPI=5
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
+
+MIN_PV="$(get_version_component_range 2)"
+
+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-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"
+IUSE="debug"
+
+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
+ cd "${S}"/nspr
+ # obsolete - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+ epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+ epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+ epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
+ # epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.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
+ eautoconf
+
+ # make sure it won't find Perl out of Prefix
+ sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+ # Respect LDFLAGS
+ sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+ "${S}"/nspr/config/rules.mk || die
+}
+
+multilib_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
+ case ${ABI} in
+ x32) myconf+=" --enable-x32";;
+ s390x|*64) myconf+=" --enable-64bit";;
+ esac
+
+ # Ancient autoconf needs help finding the right tools.
+ LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+ ac_cv_path_AR="${AR}" \
+ econf \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ $(use_enable debug) \
+ $(use_enable !debug optimize) \
+ ${myconf}
+}
+
+multilib_src_install() {
+ # Their build system is royally confusing, as usual
+ MINOR_VERSION=${MIN_PV} # Used for .so version
+ emake DESTDIR="${D}" install
+
+ einfo "removing static libraries as upstream has requested!"
+ rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+ # install nspr-config
+ is_final_abi && \
+ dobin config/nspr-config
+
+ # Remove stupid files in /usr/bin
+ rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2015-11-21 19:46 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2015-11-21 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 4c1fb6898cf53c610d1cdb146fbfb80a9b60a3d6
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 15:14:32 2015 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 15:14:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=4c1fb689
Add musl support
dev-libs/nspr/files/nspr-4.10.10-musl-support.patch | 21 +++++++++++++++++++++
.../{nspr-4.10.10.ebuild => nspr-4.10.10-r1.ebuild} | 2 ++
2 files changed, 23 insertions(+)
diff --git a/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch b/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
new file mode 100644
index 0000000..0588414
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Felix Janda <felix.janda@posteo.de>
+# Date 1429558773 -7200
+# Mon Apr 20 21:39:33 2015 +0200
+# Node ID 12494ff1de6cd7020c134d97b0b1ca81feb20520
+# Parent c5cb946571388f1643ab0fb04b3bfacd93cf818e
+Fix compilation with musl libc - try 2
+
+diff -r c5cb94657138 -r 12494ff1de6c pr/src/misc/prnetdb.c
+--- a/pr/src/misc/prnetdb.c Mon Apr 20 14:37:29 2015 -0400
++++ b/pr/src/misc/prnetdb.c Mon Apr 20 21:39:33 2015 +0200
+@@ -63,8 +63,7 @@
+
+ #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
+ || (defined(LINUX) && defined(_REENTRANT) \
+- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
+- && !defined(ANDROID))
++ && defined(__GLIBC__) && __GLIBC__ < 2)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_GETPROTO_R_POINTER
+ #endif
diff --git a/dev-libs/nspr/nspr-4.10.10.ebuild b/dev-libs/nspr/nspr-4.10.10-r1.ebuild
similarity index 97%
rename from dev-libs/nspr/nspr-4.10.10.ebuild
rename to dev-libs/nspr/nspr-4.10.10-r1.ebuild
index af321ee..76a4fd2 100644
--- a/dev-libs/nspr/nspr-4.10.10.ebuild
+++ b/dev-libs/nspr/nspr-4.10.10-r1.ebuild
@@ -37,6 +37,8 @@ src_prepare() {
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
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1128029
+ epatch "${FILESDIR}"/${P}-musl-support.patch
# rename configure.in to configure.ac for new autotools compatibility
if [[ -e "${S}"/nspr/configure.in ]] ; then
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2016-07-09 3:25 Ian Stakenvicius
0 siblings, 0 replies; 15+ messages in thread
From: Ian Stakenvicius @ 2016-07-09 3:25 UTC (permalink / raw
To: gentoo-commits
commit: d52f71cb45d18401207f45d6b398748db1f99e06
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 03:12:07 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 03:12:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=d52f71cb
dev-libs/nspr: sync with gentoo repo, bump to EAPI6
dev-libs/nspr/Manifest | 3 +-
.../nspr/files/nspr-4.10.10-musl-support.patch | 21 ----
dev-libs/nspr/nspr-4.11.ebuild | 122 ---------------------
.../{nspr-4.10.10-r1.ebuild => nspr-4.12.ebuild} | 26 ++---
4 files changed, 14 insertions(+), 158 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 879e911..505d199 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,2 +1 @@
-DIST nspr-4.10.10.tar.gz 1134164 SHA256 343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107 SHA512 60e035c4bd037bbf4bfacc97e2b1097ea78a179969fccead6a964069d826e917f07aaa35a26f123b7297521910728c11e27556fc9bbc09e385c1e8aef9dbf376 WHIRLPOOL db63a6d1e0c9d57dfa059aecf8eeff8e36d0385f598290665d525a85eb6fe173cd899bba017c82b26815d894d8ea6e728dbb7a77483036551c06c78c900d7ee3
-DIST nspr-4.11.tar.gz 1134106 SHA256 cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2 SHA512 26c47ba618f5a7748cacc5152348b6fd37bdcc82806bbff485ed4d485aecad13d202270a837c735670030e96380ec3177f3bc8a47e0dca359cfb097a84242c02 WHIRLPOOL f8707154d1981a09140d31d359d5a40867eaad447620a4731a11c770cae13b8e9a64ef45c82123083e37e2effedfb0c367cc57969a3baf65628ff1e9ccf41517
+DIST nspr-4.12.tar.gz 1135458 SHA256 e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de SHA512 138072be98dea6e97ea38f3e562c8ee383626c2136ec1adb854a81315468cd484c4b994c3ccaf6a39327b3fe121f77d698bf85c2764ec4b6231828b8a9ec5460 WHIRLPOOL d85d74e6287ed9578bc565c5e699f7201fbf38cb55e6dfa487f1c8b4684c161b6c6a5c8cb06627575d7a417bf35b15c64d231878dab32b5bbcc8223b7356c32d
diff --git a/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch b/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
deleted file mode 100644
index 0588414..0000000
--- a/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1429558773 -7200
-# Mon Apr 20 21:39:33 2015 +0200
-# Node ID 12494ff1de6cd7020c134d97b0b1ca81feb20520
-# Parent c5cb946571388f1643ab0fb04b3bfacd93cf818e
-Fix compilation with musl libc - try 2
-
-diff -r c5cb94657138 -r 12494ff1de6c pr/src/misc/prnetdb.c
---- a/pr/src/misc/prnetdb.c Mon Apr 20 14:37:29 2015 -0400
-+++ b/pr/src/misc/prnetdb.c Mon Apr 20 21:39:33 2015 +0200
-@@ -63,8 +63,7 @@
-
- #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
- || (defined(LINUX) && defined(_REENTRANT) \
-- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
-- && !defined(ANDROID))
-+ && defined(__GLIBC__) && __GLIBC__ < 2)
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_GETPROTO_R_POINTER
- #endif
diff --git a/dev-libs/nspr/nspr-4.11.ebuild b/dev-libs/nspr/nspr-4.11.ebuild
deleted file mode 100644
index 06a5648..0000000
--- a/dev-libs/nspr/nspr-4.11.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: 17c82b245d68487ac1d4455e426dd20830bb2bd1 $
-
-EAPI=5
-WANT_AUTOCONF="2.5"
-
-inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-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"
-IUSE="debug"
-
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nspr-config
-)
-
-src_prepare() {
- cd "${S}"/nspr || die
- epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
- epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- epatch "${FILESDIR}"/${PN}-4.10.6-solaris.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
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1128029
- epatch "${FILESDIR}"/${PN}-4.10.10-musl-support.patch
-
- # rename configure.in to configure.ac for new autotools compatibility
- if [[ -e "${S}"/nspr/configure.in ]] ; then
- einfo "Renaming configure.in to configure.ac"
- mv "${S}"/nspr/configure.{in,ac} || die
- fi
- # We must run eautoconf to regenerate configure
- eautoconf
-
- # make sure it won't find Perl out of Prefix
- sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- "${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
- # 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=()
-
- # The configure has some fancy --enable-{{n,x}32,64bit} switches
- # that trigger some code conditional to platform & arch. This really
- # matters for the few common arches (x86, ppc) but we pass a little
- # more of them to be future-proof.
-
- # use ABI first, this will work for most cases
- case "${ABI}" in
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
- n32) myconf+=( --enable-n32 );;
- x32) myconf+=( --enable-x32 );;
- s390x|*64) myconf+=( --enable-64bit );;
- 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*) myconf+=( --enable-x32 );;
- *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.
- LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
- ac_cv_path_AR="${AR}" \
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable debug) \
- $(use_enable !debug optimize) \
- "${myconf[@]}"
-}
-
-multilib_src_install() {
- # Their build system is royally confusing, as usual
- MINOR_VERSION=${MIN_PV} # Used for .so version
- emake DESTDIR="${D}" install
-
- einfo "removing static libraries as upstream has requested!"
- rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
- # install nspr-config
- dobin config/nspr-config
-
- # Remove stupid files in /usr/bin
- rm "${ED}"/usr/bin/prerr.properties || die
-
- # This is used only to generate prerr.c and prerr.h at build time.
- # No other projects use it, and we don't want to depend on perl.
- # Talked to upstream and they agreed w/punting.
- rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nspr/nspr-4.10.10-r1.ebuild b/dev-libs/nspr/nspr-4.12.ebuild
similarity index 79%
rename from dev-libs/nspr/nspr-4.10.10-r1.ebuild
rename to dev-libs/nspr/nspr-4.12.ebuild
index 76a4fd2..5b00005 100644
--- a/dev-libs/nspr/nspr-4.10.10-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.12.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
WANT_AUTOCONF="2.5"
-inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
+inherit autotools toolchain-funcs versionator multilib-minimal
MIN_PV="$(get_version_component_range 2)"
DESCRIPTION="Netscape Portable Runtime"
HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
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"
RDEPEND="
@@ -30,15 +30,15 @@ MULTILIB_CHOST_TOOLS=(
src_prepare() {
cd "${S}"/nspr || die
- epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
- epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
- epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
- epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+ eapply -p2 "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+ eapply -p2 "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+ eapply -p3 "${FILESDIR}"/${PN}-4.10.6-solaris.patch
+ eapply -p2 "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+ eapply -p3 "${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
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1128029
- epatch "${FILESDIR}"/${P}-musl-support.patch
+ eapply -p3 "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+
+ eapply_user
# rename configure.in to configure.ac for new autotools compatibility
if [[ -e "${S}"/nspr/configure.in ]] ; then
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2017-06-05 14:36 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2017-06-05 14:36 UTC (permalink / raw
To: gentoo-commits
commit: 504c843b24adf2a08f56582539efefacc2378c11
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 5 14:14:18 2017 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 5 14:14:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=504c843b
dev-libs/nspr: sync with main tree
dev-libs/nspr/Manifest | 2 +-
dev-libs/nspr/files/nspr-4.10.6-solaris.patch | 4 +-
dev-libs/nspr/files/nspr-4.6.1-lang.patch | 41 --------------
dev-libs/nspr/files/nspr-4.7.0-prtime.patch | 4 +-
dev-libs/nspr/files/nspr-4.7.1-solaris.patch | 4 +-
dev-libs/nspr/files/nspr-4.7.4-solaris.patch | 62 ----------------------
.../files/nspr-4.8.4-darwin-install_name.patch | 8 +--
dev-libs/nspr/files/nspr-4.8.9-link-flags.patch | 8 +--
dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch | 5 +-
dev-libs/nspr/metadata.xml | 8 +++
.../nspr/{nspr-4.12.ebuild => nspr-4.14.ebuild} | 25 +++++----
11 files changed, 39 insertions(+), 132 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 505d199..bf5aca1 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1 +1 @@
-DIST nspr-4.12.tar.gz 1135458 SHA256 e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de SHA512 138072be98dea6e97ea38f3e562c8ee383626c2136ec1adb854a81315468cd484c4b994c3ccaf6a39327b3fe121f77d698bf85c2764ec4b6231828b8a9ec5460 WHIRLPOOL d85d74e6287ed9578bc565c5e699f7201fbf38cb55e6dfa487f1c8b4684c161b6c6a5c8cb06627575d7a417bf35b15c64d231878dab32b5bbcc8223b7356c32d
+DIST nspr-4.14.tar.gz 1136626 SHA256 64fc18826257403a9132240aa3c45193d577a84b08e96f7e7770a97c074d17d5 SHA512 cb0c82d7bb3dfebdfc167f88bc0dde1c0eb4340eb7c53342a57591b120b42248da9f3ee604bec60c80c4af24fb8e46c5cacf859d66e3253e7f35d2c47cf4e676 WHIRLPOOL e9fbcfebb672d8385c9e0c503a534367709bf440cb6b8e238e2d1d5aab773792880f5f18729cbb697e7924e40934b59dff2e9c8847455f2dc79763fe0e8ef6ce
diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
index 3ae8052..6ae04f4 100644
--- a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
+++ b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
@@ -1,7 +1,7 @@
* drop Solaris linker stuff
---- nspr-4.7.4/mozilla/nsprpub/configure.in
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -1988,26 +1988,14 @@
CPU_ARCH=`uname -p`
MDCPUCFG_H=_solaris.cfg
diff --git a/dev-libs/nspr/files/nspr-4.6.1-lang.patch b/dev-libs/nspr/files/nspr-4.6.1-lang.patch
deleted file mode 100644
index 46fe15b..0000000
--- a/dev-libs/nspr/files/nspr-4.6.1-lang.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- mozilla/nsprpub/configure
-+++ mozilla/nsprpub/configure
-@@ -54,6 +54,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
-
-+# NLS nuisances.
-+# Only set these to C if already set. These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
- esac
- done
-
--# NLS nuisances.
--# Only set these to C if already set. These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}" = set; then LANG=C; export LANG; fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
index ac509ef..2de3ba3 100644
--- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
+++ b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
@@ -1,5 +1,5 @@
---- mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200
-+++ mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200
+--- a/pr/src/misc/prtime.c
++++ b/pr/src/misc/prtime.c
@@ -1536,7 +1536,7 @@
case TT_EET: zone_offset = 2 * 60; break;
case TT_JST: zone_offset = 9 * 60; break;
diff --git a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
index 5d9e810..1afab1d 100644
--- a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
+++ b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
@@ -1,8 +1,8 @@
Same magic as haubi did for glib compilation, which works again here
resolving a linker problem on Solaris with GNU ld. Bug #222625
---- mozilla/nsprpub/pr/src/Makefile.in.orig 2008-06-22 22:24:56.671065000 +0200
-+++ mozilla/nsprpub/pr/src/Makefile.in 2008-06-23 14:38:52.320417000 +0200
+--- a/pr/src/Makefile.in
++++ b/pr/src/Makefile.in
@@ -95,7 +95,7 @@
endif
diff --git a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch b/dev-libs/nspr/files/nspr-4.7.4-solaris.patch
deleted file mode 100644
index a0f14d5..0000000
--- a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-* drop Solaris linker stuff
-
---- nspr-4.7.4/mozilla/nsprpub/configure.in
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in
-@@ -1988,26 +1988,14 @@
- CPU_ARCH=`uname -p`
- MDCPUCFG_H=_solaris.cfg
- PR_MD_CSRCS=solaris.c
-- LD=/usr/ccs/bin/ld
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- RESOLVE_LINK_SYMBOLS=1
-- case "${OS_RELEASE}" in
-- 5.8|5.9)
-- ;;
-- *)
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
-- USE_B_DIRECT=1
-- ;;
-- esac
- if test -n "$GNU_CC"; then
- DSO_CFLAGS=-fPIC
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
- GCC_USE_GNU_LD=1
- fi
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore'
-- if test -n "$USE_B_DIRECT"; then
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
-- fi
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- else
- DSO_CFLAGS=-KPIC
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
---- nspr-4.7.4/mozilla/nsprpub/configure
-+++ nspr-4.7.4/mozilla/nsprpub/configure
-@@ -4765,26 +4765,14 @@
- CPU_ARCH=`uname -p`
- MDCPUCFG_H=_solaris.cfg
- PR_MD_CSRCS=solaris.c
-- LD=/usr/ccs/bin/ld
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- RESOLVE_LINK_SYMBOLS=1
-- case "${OS_RELEASE}" in
-- 5.8|5.9)
-- ;;
-- *)
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
-- USE_B_DIRECT=1
-- ;;
-- esac
- if test -n "$GNU_CC"; then
- DSO_CFLAGS=-fPIC
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
- GCC_USE_GNU_LD=1
- fi
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore'
-- if test -n "$USE_B_DIRECT"; then
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
-- fi
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- else
- DSO_CFLAGS=-KPIC
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
diff --git a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
index 1258b60..4045e90 100644
--- a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
+++ b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
@@ -1,8 +1,8 @@
Don't use @executable_path, it messed up linking against nspr from e.g.
nss.
---- mozilla/nsprpub/configure.in
-+++ mozilla/nsprpub/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -1007,7 +1007,7 @@
;;
esac
@@ -12,8 +12,8 @@ nss.
_OPTIMIZE_FLAGS=-O2
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
STRIP="$STRIP -x -S"
---- mozilla/nsprpub/configure
-+++ mozilla/nsprpub/configure
+--- a/configure
++++ b/configure
@@ -1007,7 +1007,7 @@
;;
esac
diff --git a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
index dd3b132..5d37018 100644
--- a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
+++ b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
@@ -5,8 +5,8 @@ autoparallelization). Other flags are required when building and linking
https://bugs.gentoo.org/365975
---- a/mozilla/nsprpub/config/autoconf.mk.in
-+++ b/mozilla/nsprpub/config/autoconf.mk.in
+--- a/config/autoconf.mk.in
++++ b/config/autoconf.mk.in
@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@
DLLFLAGS = @DLLFLAGS@
EXEFLAGS = @EXEFLAGS@
@@ -15,8 +15,8 @@ https://bugs.gentoo.org/365975
PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@
---- a/mozilla/nsprpub/config/config.mk
-+++ b/mozilla/nsprpub/config/config.mk
+--- a/config/config.mk
++++ b/config/config.mk
@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
$(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
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
index d4f9a7e..a22b0b9 100644
--- a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
+++ b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
@@ -1,6 +1,5 @@
-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
+--- a/config/nspr-config.in
++++ b/config/nspr-config.in
@@ -126,7 +126,7 @@
fi
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
new file mode 100644
index 0000000..d9b367e
--- /dev/null
+++ b/dev-libs/nspr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>mozilla@gentoo.org</email>
+ <name>Gentoo Mozilla Team</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/nspr/nspr-4.12.ebuild b/dev-libs/nspr/nspr-4.14.ebuild
similarity index 83%
rename from dev-libs/nspr/nspr-4.12.ebuild
rename to dev-libs/nspr/nspr-4.14.ebuild
index a99d0b5..7b372af 100644
--- a/dev-libs/nspr/nspr-4.12.ebuild
+++ b/dev-libs/nspr/nspr-4.14.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
WANT_AUTOCONF="2.5"
-inherit autotools toolchain-funcs versionator multilib-minimal
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
MIN_PV="$(get_version_component_range 2)"
@@ -14,7 +14,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
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"
RDEPEND="
@@ -27,17 +27,20 @@ MULTILIB_CHOST_TOOLS=(
/usr/bin/nspr-config
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+ "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+ "${FILESDIR}"/${PN}-4.10.6-solaris.patch
+ "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+ "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+ # We do not need to pass -L$libdir via nspr-config --libs
+ "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+)
+
src_prepare() {
cd "${S}"/nspr || die
- eapply -p2 "${FILESDIR}"/${PN}-4.7.0-prtime.patch
- eapply -p2 "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- eapply -p3 "${FILESDIR}"/${PN}-4.10.6-solaris.patch
- eapply -p2 "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
- eapply -p3 "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
- # We do not need to pass -L$libdir via nspr-config --libs
- eapply -p3 "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
- eapply_user
+ default
# rename configure.in to configure.ac for new autotools compatibility
if [[ -e "${S}"/nspr/configure.in ]] ; then
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2017-06-07 17:26 Jory Pratt
0 siblings, 0 replies; 15+ messages in thread
From: Jory Pratt @ 2017-06-07 17:26 UTC (permalink / raw
To: gentoo-commits
commit: cfd68b0c8637eaefcf704e686e77536eff3e2403
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 7 17:25:38 2017 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 7 17:25:38 2017 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=cfd68b0c
dev-libs/nspr: nspr-4.15 version bump, fix broken configure regeneration
dev-libs/nspr/Manifest | 2 +-
dev-libs/nspr/files/nspr-4.15-configure_in.patch | 26 ++++++++++++++++++++++
.../nspr/{nspr-4.14.ebuild => nspr-4.15.ebuild} | 3 +++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index bf5aca1..8049e31 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1 +1 @@
-DIST nspr-4.14.tar.gz 1136626 SHA256 64fc18826257403a9132240aa3c45193d577a84b08e96f7e7770a97c074d17d5 SHA512 cb0c82d7bb3dfebdfc167f88bc0dde1c0eb4340eb7c53342a57591b120b42248da9f3ee604bec60c80c4af24fb8e46c5cacf859d66e3253e7f35d2c47cf4e676 WHIRLPOOL e9fbcfebb672d8385c9e0c503a534367709bf440cb6b8e238e2d1d5aab773792880f5f18729cbb697e7924e40934b59dff2e9c8847455f2dc79763fe0e8ef6ce
+DIST nspr-4.15.tar.gz 1140182 SHA256 27dde06bc3d0c88903a20d6ad807361a912cfb624ca0ab4efb10fc50b19e2d80 SHA512 1d6e9ba3ef71376ddb4f5ef2a6796bf3f95cf37abfac89d1745f02cc01003877d088a87946208d3827a3b3e28420215e543a647aadceff2ae6f9c1c70d4ac563 WHIRLPOOL c69216c577a466317c760e2745f2d1ea71915160990ee6ed2c649b45b314bbcef470e950cf001f43898213c09b39cb016df2a49dbe3f91448d0cc345d38017b1
diff --git a/dev-libs/nspr/files/nspr-4.15-configure_in.patch b/dev-libs/nspr/files/nspr-4.15-configure_in.patch
new file mode 100644
index 0000000..a33717f
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.15-configure_in.patch
@@ -0,0 +1,26 @@
+From 9c751b2e857db1760d2fa82d9c20e7da518a5da7 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Wed, 7 Jun 2017 12:14:46 -0500
+Subject: [PATCH] Close out darwin if statement, will breakage configure.in
+ rename to configure.ac
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ configure.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.in b/configure.in
+index 4b2e46d..dc14ee5 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1389,6 +1389,7 @@ case "$target" in
+ changequote([,])
+ if test "$HOST_DARWIN_MAJOR" -ge 15 ; then
+ AC_DEFINE(HAS_CONNECTX)
++ fi
+ AS='$(CC) -x assembler-with-cpp'
+ CFLAGS="$CFLAGS -Wall -fno-common"
+ case "${target_cpu}" in
+--
+2.13.1
+
diff --git a/dev-libs/nspr/nspr-4.14.ebuild b/dev-libs/nspr/nspr-4.15.ebuild
similarity index 97%
rename from dev-libs/nspr/nspr-4.14.ebuild
rename to dev-libs/nspr/nspr-4.15.ebuild
index 7b372af..87057ab 100644
--- a/dev-libs/nspr/nspr-4.14.ebuild
+++ b/dev-libs/nspr/nspr-4.15.ebuild
@@ -35,6 +35,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
# We do not need to pass -L$libdir via nspr-config --libs
"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+ # Fix configure.in to we can generate a working configure.ac
+ "${FILESDIR}"/${PN}-4.15-configure_in.patch
)
src_prepare() {
@@ -47,6 +49,7 @@ src_prepare() {
einfo "Renaming configure.in to configure.ac"
mv "${S}"/nspr/configure.{in,ac} || die
fi
+
# We must run eautoconf to regenerate configure
eautoconf
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2019-10-22 8:44 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2019-10-22 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 4f45a84dfb9212a2561982546a294c3c6a7f88af
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 08:43:51 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 08:43:51 2019 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=4f45a84d
dev-libs/nspr: Bump to version 4.23. Removed old
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-libs/nspr/Manifest | 2 +-
dev-libs/nspr/files/nspr-4.23-prtime.patch | 26 ++++++++++++++++++++++
dev-libs/nspr/files/nspr-4.7.0-prtime.patch | 26 ----------------------
.../nspr/{nspr-4.22.ebuild => nspr-4.23.ebuild} | 6 +++--
4 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 131c8aa..9e0d50f 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1 +1 @@
-DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
+DIST nspr-4.23.tar.gz 1078660 BLAKE2B 4599684e1bb80238e409472f41d0e9ba9bc731b48fb17578c99426b277bbfa9f3c8348570b58f679ad7fa94421a1c6b5972f9218e9d56fb5d1d49d45cf04363c SHA512 19f964f11a6ae8acf83a6daa0c9ee141c6f2793fd79113f3d283e9590bc2c90bfa4e46814f902f376f15c0668fa9c283cc44f975d88461d8854b87b67c0a21c1
diff --git a/dev-libs/nspr/files/nspr-4.23-prtime.patch b/dev-libs/nspr/files/nspr-4.23-prtime.patch
new file mode 100644
index 0000000..087e427
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.23-prtime.patch
@@ -0,0 +1,26 @@
+--- a/pr/src/misc/prtime.c
++++ b/pr/src/misc/prtime.c
+@@ -1621,7 +1621,7 @@
+ case TT_EET: zone_offset = 2 * 60; break;
+ case TT_JST: zone_offset = 9 * 60; break;
+ default:
+- PR_ASSERT (0);
++ return PR_FAILURE;
+ break;
+ }
+ }
+@@ -1677,11 +1677,12 @@
+ struct tm localTime;
+ time_t secs;
+
+- PR_ASSERT(result->tm_month > -1 &&
++ if (!(result->tm_month > -1 &&
+ result->tm_mday > 0 &&
+ result->tm_hour > -1 &&
+ result->tm_min > -1 &&
+- result->tm_sec > -1);
++ result->tm_sec > -1))
++ return PR_FAILURE;
+
+ /*
+ * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
deleted file mode 100644
index 2de3ba3..0000000
--- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/pr/src/misc/prtime.c
-+++ b/pr/src/misc/prtime.c
-@@ -1536,7 +1536,7 @@
- case TT_EET: zone_offset = 2 * 60; break;
- case TT_JST: zone_offset = 9 * 60; break;
- default:
-- PR_ASSERT (0);
-+ return PR_FAILURE;
- break;
- }
- }
-@@ -1578,11 +1578,12 @@
- struct tm localTime;
- time_t secs;
-
-- PR_ASSERT(result->tm_month > -1 &&
-+ if (!(result->tm_month > -1 &&
- result->tm_mday > 0 &&
- result->tm_hour > -1 &&
- result->tm_min > -1 &&
-- result->tm_sec > -1);
-+ result->tm_sec > -1))
-+ return PR_FAILURE;
-
- /*
- * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.23.ebuild
similarity index 93%
rename from dev-libs/nspr/nspr-4.22.ebuild
rename to dev-libs/nspr/nspr-4.23.ebuild
index dd4c8f1..1f11ed3 100644
--- a/dev-libs/nspr/nspr-4.22.ebuild
+++ b/dev-libs/nspr/nspr-4.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
@@ -21,7 +21,7 @@ MULTILIB_CHOST_TOOLS=(
)
PATCHES=(
- "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+ "${FILESDIR}"/${PN}-4.23-prtime.patch
"${FILESDIR}"/${PN}-4.7.1-solaris.patch
"${FILESDIR}"/${PN}-4.10.6-solaris.patch
"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
@@ -41,6 +41,8 @@ src_prepare() {
if [[ -e "${S}"/nspr/configure.in ]] ; then
einfo "Renaming configure.in to configure.ac"
mv "${S}"/nspr/configure.{in,ac} || die
+ else
+ elog "configure.in rename logic can be removed from ebuild."
fi
# We must run eautoconf to regenerate configure
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
@ 2022-04-12 11:56 Joonas Niilola
0 siblings, 0 replies; 15+ messages in thread
From: Joonas Niilola @ 2022-04-12 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 2171c8cfe78e3dee0a02a606ea1d3cf475d017e5
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 11:37:28 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 11:54:54 2022 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=2171c8cf
dev-libs/nspr: remove outdated
- and most likely security vulnerable versions,
- ::gentoo is at 4.33.
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/nspr/Manifest | 1 -
dev-libs/nspr/files/nspr-4.10.6-solaris.patch | 32 ------
.../nspr/files/nspr-4.21-ipv6-musl-support.patch | 53 ---------
dev-libs/nspr/files/nspr-4.23-prtime.patch | 26 -----
dev-libs/nspr/files/nspr-4.7.1-solaris.patch | 14 ---
.../files/nspr-4.8.4-darwin-install_name.patch | 25 -----
dev-libs/nspr/files/nspr-4.8.9-link-flags.patch | 28 -----
dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch | 11 --
dev-libs/nspr/metadata.xml | 8 --
dev-libs/nspr/nspr-4.25.ebuild | 122 ---------------------
10 files changed, 320 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
deleted file mode 100644
index 131b1010..00000000
--- a/dev-libs/nspr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nspr-4.25.tar.gz 1079633 BLAKE2B 377e5ec0e60cca13f1ee988adb10870bbb6cb9e4eb61e4434152418d4f8d446741a192d7019298ec2669b8e190cacb6a1ca9c4b2838e9b14dd3590ed40facdd2 SHA512 b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562
diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
deleted file mode 100644
index 6ae04f40..00000000
--- a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-* drop Solaris linker stuff
-
---- a/configure.in
-+++ b/configure.in
-@@ -1988,26 +1988,14 @@
- CPU_ARCH=`uname -p`
- MDCPUCFG_H=_solaris.cfg
- PR_MD_CSRCS=solaris.c
-- LD=/usr/ccs/bin/ld
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- RESOLVE_LINK_SYMBOLS=1
-- case "${OS_RELEASE}" in
-- 5.8|5.9)
-- ;;
-- *)
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
-- USE_B_DIRECT=1
-- ;;
-- esac
- if test -n "$GNU_CC"; then
- DSO_CFLAGS=-fPIC
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
- GCC_USE_GNU_LD=1
- fi
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore'
-- if test -n "$USE_B_DIRECT"; then
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
-- fi
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- else
- DSO_CFLAGS=-KPIC
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
diff --git a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
deleted file mode 100644
index 2c8ebd4c..00000000
--- a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8c57451f44d7ceb37bfb4ae6e457fc70b1f58d0a Mon Sep 17 00:00:00 2001
-From: Moritz Kick <gentoo@blackphoenix.de>
-Date: Wed, 20 Mar 2019 13:36:06 -0500
-Subject: [PATCH] Added IPv6 compatibility for musl libc
-
-Signed-off-by: Moritz Kick <gentoo@blackphoenix.de>
-Signed-off-by: Jory Pratt <anarchy@gentoo.org>
----
- pr/include/md/_linux.h | 13 +------------
- 1 file changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
-index 2370ab8..612184c 100644
---- a/pr/include/md/_linux.h
-+++ b/pr/include/md/_linux.h
-@@ -289,33 +289,22 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv)
- #endif /* __arm__ */
-
- #define USE_SETJMP
--#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID)
- #define _PR_POLL_AVAILABLE
--#endif
- #undef _PR_USE_POLL
- #define _PR_STAT_HAS_ONLY_ST_ATIME
- #if defined(__alpha) || defined(__ia64__)
- #define _PR_HAVE_LARGE_OFF_T
--#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
-- || defined(ANDROID)
--#define _PR_HAVE_OFF64_T
- #else
--#define _PR_NO_LARGE_FILES
-+#define _PR_HAVE_OFF64_T
- #endif
--#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
-- || defined(ANDROID)
- #define _PR_INET6
- #define _PR_HAVE_INET_NTOP
- #define _PR_HAVE_GETHOSTBYNAME2
- #define _PR_HAVE_GETADDRINFO
- #define _PR_INET6_PROBE
--#endif
- #ifndef ANDROID
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
--#endif
--/* Android has gethostbyname_r but not gethostbyaddr_r or gethostbyname2_r. */
--#if (__GLIBC__ >= 2) && defined(_PR_PTHREADS)
- #define _PR_HAVE_GETHOST_R
- #define _PR_HAVE_GETHOST_R_INT
- #endif
---
-2.21.0
-
diff --git a/dev-libs/nspr/files/nspr-4.23-prtime.patch b/dev-libs/nspr/files/nspr-4.23-prtime.patch
deleted file mode 100644
index 087e4278..00000000
--- a/dev-libs/nspr/files/nspr-4.23-prtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/pr/src/misc/prtime.c
-+++ b/pr/src/misc/prtime.c
-@@ -1621,7 +1621,7 @@
- case TT_EET: zone_offset = 2 * 60; break;
- case TT_JST: zone_offset = 9 * 60; break;
- default:
-- PR_ASSERT (0);
-+ return PR_FAILURE;
- break;
- }
- }
-@@ -1677,11 +1677,12 @@
- struct tm localTime;
- time_t secs;
-
-- PR_ASSERT(result->tm_month > -1 &&
-+ if (!(result->tm_month > -1 &&
- result->tm_mday > 0 &&
- result->tm_hour > -1 &&
- result->tm_min > -1 &&
-- result->tm_sec > -1);
-+ result->tm_sec > -1))
-+ return PR_FAILURE;
-
- /*
- * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
deleted file mode 100644
index 1afab1dd..00000000
--- a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Same magic as haubi did for glib compilation, which works again here
-resolving a linker problem on Solaris with GNU ld. Bug #222625
-
---- a/pr/src/Makefile.in
-+++ b/pr/src/Makefile.in
-@@ -95,7 +95,7 @@
- endif
-
- ifdef USE_PTHREADS
--OS_LIBS = -lpthread ${LIBRT} -lsocket -lnsl -ldl -lc
-+OS_LIBS = -pthread ${LIBRT} -lsocket -lnsl -ldl -lc
- else
- ifdef LOCAL_THREADS_ONLY
- OS_LIBS = -lsocket -lnsl -ldl -lc
diff --git a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
deleted file mode 100644
index 4045e909..00000000
--- a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Don't use @executable_path, it messed up linking against nspr from e.g.
-nss.
-
---- a/configure.in
-+++ b/configure.in
-@@ -1007,7 +1007,7 @@
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$@ -headerpad_max_install_names'
- _OPTIMIZE_FLAGS=-O2
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- STRIP="$STRIP -x -S"
---- a/configure
-+++ b/configure
-@@ -1007,7 +1007,7 @@
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$@ -headerpad_max_install_names'
- _OPTIMIZE_FLAGS=-O2
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- STRIP="$STRIP -x -S"
diff --git a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
deleted file mode 100644
index 5d37018d..00000000
--- a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Use CFLAGS when linking. Some flags can add functionality to generated
-code that requires extra libs to be linked in (eg. libgomp when using
-autoparallelization). Other flags are required when building and linking
-(eg. -flto).
-
-https://bugs.gentoo.org/365975
-
---- a/config/autoconf.mk.in
-+++ b/config/autoconf.mk.in
-@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@
- DLLFLAGS = @DLLFLAGS@
- EXEFLAGS = @EXEFLAGS@
- OPTIMIZER = @OPTIMIZER@
-+LD_CFLAGS = @CFLAGS@
-
- PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
- PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@
---- a/config/config.mk
-+++ b/config/config.mk
-@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
- NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-
--LDFLAGS = $(OS_LDFLAGS)
-+LDFLAGS = $(LD_CFLAGS) $(OS_LDFLAGS)
-
- # Enable profile-guided optimization
- ifdef MOZ_PROFILE_GENERATE
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
deleted file mode 100644
index a22b0b93..00000000
--- a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config/nspr-config.in
-+++ b/config/nspr-config.in
-@@ -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/metadata.xml b/dev-libs/nspr/metadata.xml
deleted file mode 100644
index d9b367ed..00000000
--- a/dev-libs/nspr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>mozilla@gentoo.org</email>
- <name>Gentoo Mozilla Team</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/nspr/nspr-4.25.ebuild b/dev-libs/nspr/nspr-4.25.ebuild
deleted file mode 100644
index c238ea28..00000000
--- a/dev-libs/nspr/nspr-4.25.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib-minimal
-
-MIN_PV="$(ver_cut 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug elibc_musl"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nspr-config
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.23-prtime.patch
- "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- "${FILESDIR}"/${PN}-4.10.6-solaris.patch
- "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
- "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
- # We do not need to pass -L$libdir via nspr-config --libs
- "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-)
-
-src_prepare() {
- cd "${S}"/nspr || die
-
- default
-
- use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
-
- # rename configure.in to configure.ac for new autotools compatibility
- if [[ -e "${S}"/nspr/configure.in ]] ; then
- einfo "Renaming configure.in to configure.ac"
- mv "${S}"/nspr/configure.{in,ac} || die
- else
- elog "configure.in rename logic can be removed from ebuild."
- fi
-
- # We must run eautoconf to regenerate configure
- eautoconf
-
- # make sure it won't find Perl out of Prefix
- sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- "${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
- # 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=(
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- $(use_enable debug)
- $(use_enable !debug optimize)
- )
-
- # The configure has some fancy --enable-{{n,x}32,64bit} switches
- # that trigger some code conditional to platform & arch. This really
- # matters for the few common arches (x86, ppc) but we pass a little
- # more of them to be future-proof.
-
- # use ABI first, this will work for most cases
- case "${ABI}" in
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
- n32) myconf+=( --enable-n32 );;
- x32) myconf+=( --enable-x32 );;
- s390x|*64) myconf+=( --enable-64bit );;
- 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*) myconf+=( --enable-x32 );;
- *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.
- LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
- ac_cv_path_AR="${AR}" \
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- # Their build system is royally confusing, as usual
- MINOR_VERSION=${MIN_PV} # Used for .so version
- emake DESTDIR="${D}" install
-
- einfo "removing static libraries as upstream has requested!"
- rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
- # install nspr-config
- dobin config/nspr-config
-
- # Remove stupid files in /usr/bin
- rm "${ED}"/usr/bin/prerr.properties || die
-
- # This is used only to generate prerr.c and prerr.h at build time.
- # No other projects use it, and we don't want to depend on perl.
- # Talked to upstream and they agreed w/punting.
- rm "${ED}"/usr/bin/compile-et.pl || die
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2022-04-12 11:56 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-21 19:46 [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/ Jory Pratt
-- strict thread matches above, loose matches on Subject: below --
2022-04-12 11:56 Joonas Niilola
2019-10-22 8:44 Lars Wendler
2017-06-07 17:26 Jory Pratt
2017-06-05 14:36 Jory Pratt
2016-07-09 3:25 Ian Stakenvicius
2014-06-12 15:22 Ian Stakenvicius
2013-03-11 16:04 Jory Pratt
2013-02-17 2:59 Jory Pratt
2012-11-25 12:38 Jory Pratt
2012-07-21 1:57 Jory Pratt
2012-06-24 3:31 Jory Pratt
2012-06-22 0:50 Jory Pratt
2012-02-21 0:24 Jory Pratt
2012-01-10 2:09 Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox