From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/
Date: Tue, 10 Jan 2012 02:09:49 +0000 (UTC) [thread overview]
Message-ID: <b8aafbddbb42060486e236f2a6a0af7dcfbd8261.anarchy@gentoo> (raw)
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
next reply other threads:[~2012-01-10 2:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-10 2:09 Jory Pratt [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-02-21 0:24 [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/ Jory Pratt
2012-06-22 0:50 Jory Pratt
2012-06-24 3:31 Jory Pratt
2012-07-21 1:57 Jory Pratt
2012-11-25 12:38 Jory Pratt
2013-02-17 2:59 Jory Pratt
2013-03-11 16:04 Jory Pratt
2014-06-12 15:22 Ian Stakenvicius
2015-11-21 19:46 Jory Pratt
2016-07-09 3:25 Ian Stakenvicius
2017-06-05 14:36 Jory Pratt
2017-06-07 17:26 Jory Pratt
2019-10-22 8:44 Lars Wendler
2022-04-12 11:56 Joonas Niilola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b8aafbddbb42060486e236f2a6a0af7dcfbd8261.anarchy@gentoo \
--to=anarchy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox