| 1 |
commit: b8aafbddbb42060486e236f2a6a0af7dcfbd8261 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 10 02:09:07 2012 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 10 02:09:07 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=b8aafbdd |
| 7 |
|
| 8 |
bug #365975, thanks dirtyepic for patch |
| 9 |
|
| 10 |
--- |
| 11 |
dev-libs/nspr/Manifest | 3 +- |
| 12 |
dev-libs/nspr/files/nspr-4.8.9-link-flags.patch | 28 ++++++++++++++++++++ |
| 13 |
.../{nspr-4.8.9.ebuild => nspr-4.8.9-r1.ebuild} | 1 + |
| 14 |
3 files changed, 31 insertions(+), 1 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest |
| 17 |
index 695df1c..dacd575 100644 |
| 18 |
--- a/dev-libs/nspr/Manifest |
| 19 |
+++ b/dev-libs/nspr/Manifest |
| 20 |
@@ -8,5 +8,6 @@ AUX nspr-4.8-pkgconfig-gentoo-3.patch 4726 RMD160 c8e93e2a06b90d6e69a12dce4cfaba |
| 21 |
AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9efc SHA1 7919b736f4ebe12d8067ba400325487c06df3d04 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f |
| 22 |
AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa |
| 23 |
AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab |
| 24 |
+AUX nspr-4.8.9-link-flags.patch 995 RMD160 68a140db428f707f9f8295757c55f343e0f774e3 SHA1 8885af906cd5d21d0d678b42e51b667568fb449a SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610 |
| 25 |
DIST nspr-4.8.9.tar.gz 1235265 RMD160 6c7089a9d798367b8d559e5dea8e732e73b47df2 SHA1 509785e68f52542778c770445329cc4db15c749b SHA256 ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce |
| 26 |
-EBUILD nspr-4.8.9.ebuild 3559 RMD160 cb5afab90bc68ffaf93873228ee7914d4d89e82f SHA1 a74633357fea657dee06ede6acb79270c6f8e6e5 SHA256 d1b0c1abf7e2cbc8294a7303d09b827c7f78f934bf9e623182583ab8c0519b70 |
| 27 |
+EBUILD nspr-4.8.9-r1.ebuild 3610 RMD160 2a3690bf547e5b4043c290ab32041a47fab04b82 SHA1 fff7da0a569f3174f4486344c5f86a284dba1ab4 SHA256 54f47f3421fc6f1d9a210953ea493fb89943b9e8e844ff1b2fb9fc03276e4d00 |
| 28 |
|
| 29 |
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 |
| 30 |
new file mode 100644 |
| 31 |
index 0000000..dd3b132 |
| 32 |
--- /dev/null |
| 33 |
+++ b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch |
| 34 |
@@ -0,0 +1,28 @@ |
| 35 |
+Use CFLAGS when linking. Some flags can add functionality to generated |
| 36 |
+code that requires extra libs to be linked in (eg. libgomp when using |
| 37 |
+autoparallelization). Other flags are required when building and linking |
| 38 |
+(eg. -flto). |
| 39 |
+ |
| 40 |
+https://bugs.gentoo.org/365975 |
| 41 |
+ |
| 42 |
+--- a/mozilla/nsprpub/config/autoconf.mk.in |
| 43 |
++++ b/mozilla/nsprpub/config/autoconf.mk.in |
| 44 |
+@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@ |
| 45 |
+ DLLFLAGS = @DLLFLAGS@ |
| 46 |
+ EXEFLAGS = @EXEFLAGS@ |
| 47 |
+ OPTIMIZER = @OPTIMIZER@ |
| 48 |
++LD_CFLAGS = @CFLAGS@ |
| 49 |
+ |
| 50 |
+ PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@ |
| 51 |
+ PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@ |
| 52 |
+--- a/mozilla/nsprpub/config/config.mk |
| 53 |
++++ b/mozilla/nsprpub/config/config.mk |
| 54 |
+@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ |
| 55 |
+ NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ |
| 56 |
+ $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) |
| 57 |
+ |
| 58 |
+-LDFLAGS = $(OS_LDFLAGS) |
| 59 |
++LDFLAGS = $(LD_CFLAGS) $(OS_LDFLAGS) |
| 60 |
+ |
| 61 |
+ # Enable profile-guided optimization |
| 62 |
+ ifdef MOZ_PROFILE_GENERATE |
| 63 |
|
| 64 |
diff --git a/dev-libs/nspr/nspr-4.8.9.ebuild b/dev-libs/nspr/nspr-4.8.9-r1.ebuild |
| 65 |
similarity index 98% |
| 66 |
rename from dev-libs/nspr/nspr-4.8.9.ebuild |
| 67 |
rename to dev-libs/nspr/nspr-4.8.9-r1.ebuild |
| 68 |
index b7963b4..e4ce0b1 100644 |
| 69 |
--- a/dev-libs/nspr/nspr-4.8.9.ebuild |
| 70 |
+++ b/dev-libs/nspr/nspr-4.8.9-r1.ebuild |
| 71 |
@@ -30,6 +30,7 @@ src_prepare() { |
| 72 |
# Patch needs updating |
| 73 |
#epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch |
| 74 |
epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch |
| 75 |
+ epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch |
| 76 |
# make sure it won't find Perl out of Prefix |
| 77 |
sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die |
Archives