From: "Ian Stakenvicius" <axs@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, www-client/seamonkey/, ...
Date: Thu, 26 Sep 2013 16:34:39 +0000 (UTC) [thread overview]
Message-ID: <1380213262.b9ef50e665245324cc4025b096dc1b9c3c2edaa3.axs@gentoo> (raw)
commit: b9ef50e665245324cc4025b096dc1b9c3c2edaa3
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 16:33:12 2013 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 16:34:22 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=b9ef50e6
drop -Wl,--build-id from LDFLAGS, bug #465466; also add missing selinux in seamonkey IUSE
---
.../thunderbird/files/moz24-drop-Wl-build-id.patch | 32 ++++++++++++++++++++++
mail-client/thunderbird/thunderbird-24.0-r1.ebuild | 4 ++-
.../firefox/files/moz24-drop-Wl-build-id.patch | 32 ++++++++++++++++++++++
www-client/firefox/firefox-24.0-r1.ebuild | 6 ++--
.../seamonkey/files/moz24-drop-Wl-build-id.patch | 32 ++++++++++++++++++++++
www-client/seamonkey/seamonkey-2.21.ebuild | 4 ++-
6 files changed, 106 insertions(+), 4 deletions(-)
diff --git a/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch b/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch
new file mode 100644
index 0000000..434dd23
--- /dev/null
+++ b/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch
@@ -0,0 +1,32 @@
+--- a/comm-esr24/mozilla/configure.in 2013-09-26 09:41:27.220542321 -0400
++++ b/comm-esr24/mozilla/configure.in 2013-09-26 09:49:07.888550730 -0400
+@@ -1339,13 +1339,6 @@
+ AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+ AC_MSG_RESULT([no])
+ LDFLAGS=$_SAVE_LDFLAGS)
+- AC_MSG_CHECKING([for --build-id option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes])
+- [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"],
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+
+
+ # Check for -mssse3 on $CC
+--- a/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:41:27.222542321 -0400
++++ b/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:49:19.121550935 -0400
+@@ -1154,13 +1154,6 @@
+ DSO_PIC_CFLAGS='-fPIC'
+ ASFLAGS="$ASFLAGS -fPIC"
+
+- AC_MSG_CHECKING([for --build-id option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+-
+ # Turn on GNU-specific warnings:
+ # -Wall - turn on a lot of warnings
+ # -Wpointer-arith - good to have
diff --git a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild b/mail-client/thunderbird/thunderbird-24.0-r1.ebuild
index 4bdf8d3..a46f767 100644
--- a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.0-r1.ebuild
@@ -51,7 +51,7 @@ SRC_URI="${SRC_URI}
ASM_DEPEND=">=dev-lang/yasm-1.1"
-RDEPEND="
+RDEPEND="
>=sys-devel/binutils-2.16.1
>=dev-libs/nss-3.15.1
>=dev-libs/nspr-4.10
@@ -122,6 +122,8 @@ src_prepare() {
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/thunderbird"
+ # drop -Wl,--build-id from LDFLAGS, bug #465446
+ epatch "${FILESDIR}"/moz${PV%%\.*}-drop-Wl-build-id.patch
# Apply our patchset from firefox to thunderbird as well
pushd "${S}"/mozilla &>/dev/null || die
diff --git a/www-client/firefox/files/moz24-drop-Wl-build-id.patch b/www-client/firefox/files/moz24-drop-Wl-build-id.patch
new file mode 100644
index 0000000..434dd23
--- /dev/null
+++ b/www-client/firefox/files/moz24-drop-Wl-build-id.patch
@@ -0,0 +1,32 @@
+--- a/comm-esr24/mozilla/configure.in 2013-09-26 09:41:27.220542321 -0400
++++ b/comm-esr24/mozilla/configure.in 2013-09-26 09:49:07.888550730 -0400
+@@ -1339,13 +1339,6 @@
+ AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+ AC_MSG_RESULT([no])
+ LDFLAGS=$_SAVE_LDFLAGS)
+- AC_MSG_CHECKING([for --build-id option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes])
+- [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"],
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+
+
+ # Check for -mssse3 on $CC
+--- a/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:41:27.222542321 -0400
++++ b/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:49:19.121550935 -0400
+@@ -1154,13 +1154,6 @@
+ DSO_PIC_CFLAGS='-fPIC'
+ ASFLAGS="$ASFLAGS -fPIC"
+
+- AC_MSG_CHECKING([for --build-id option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+-
+ # Turn on GNU-specific warnings:
+ # -Wall - turn on a lot of warnings
+ # -Wpointer-arith - good to have
diff --git a/www-client/firefox/firefox-24.0-r1.ebuild b/www-client/firefox/firefox-24.0-r1.ebuild
index 03e1525..23eaae4 100644
--- a/www-client/firefox/firefox-24.0-r1.ebuild
+++ b/www-client/firefox/firefox-24.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-18.0-r1.ebuild,v 1.1 2013/01/16 16:58:19 anarchy Exp $
+# $Header: $
EAPI="3"
VIRTUALX_REQUIRED="pgo"
@@ -147,6 +147,8 @@ src_prepare() {
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
+ # drop -Wl,--build-id from LDFLAGS, bug #465446
+ epatch "${FILESDIR}"/moz${PV%%\.*}-drop-Wl-build-id.patch
# Allow user to apply any additional patches without modifing ebuild
epatch_user
@@ -157,7 +159,7 @@ src_prepare() {
"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
fi
- # Ensure that are plugins dir is enabled as default
+ # Ensure that our plugins dir is enabled as default
sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
diff --git a/www-client/seamonkey/files/moz24-drop-Wl-build-id.patch b/www-client/seamonkey/files/moz24-drop-Wl-build-id.patch
new file mode 100644
index 0000000..434dd23
--- /dev/null
+++ b/www-client/seamonkey/files/moz24-drop-Wl-build-id.patch
@@ -0,0 +1,32 @@
+--- a/comm-esr24/mozilla/configure.in 2013-09-26 09:41:27.220542321 -0400
++++ b/comm-esr24/mozilla/configure.in 2013-09-26 09:49:07.888550730 -0400
+@@ -1339,13 +1339,6 @@
+ AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+ AC_MSG_RESULT([no])
+ LDFLAGS=$_SAVE_LDFLAGS)
+- AC_MSG_CHECKING([for --build-id option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes])
+- [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"],
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+
+
+ # Check for -mssse3 on $CC
+--- a/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:41:27.222542321 -0400
++++ b/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:49:19.121550935 -0400
+@@ -1154,13 +1154,6 @@
+ DSO_PIC_CFLAGS='-fPIC'
+ ASFLAGS="$ASFLAGS -fPIC"
+
+- AC_MSG_CHECKING([for --build-id option to ld])
+- _SAVE_LDFLAGS=$LDFLAGS
+- LDFLAGS="$LDFLAGS -Wl,--build-id"
+- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+- AC_MSG_RESULT([no])
+- LDFLAGS=$_SAVE_LDFLAGS)
+-
+ # Turn on GNU-specific warnings:
+ # -Wall - turn on a lot of warnings
+ # -Wpointer-arith - good to have
diff --git a/www-client/seamonkey/seamonkey-2.21.ebuild b/www-client/seamonkey/seamonkey-2.21.ebuild
index bd99c36..ff65a4f 100644
--- a/www-client/seamonkey/seamonkey-2.21.ebuild
+++ b/www-client/seamonkey/seamonkey-2.21.ebuild
@@ -47,7 +47,7 @@ fi
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming system-cairo system-icu system-jpeg system-sqlite"
+IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming selinux system-cairo system-icu system-jpeg system-sqlite"
SRC_URI="${SRC_URI}
${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
@@ -130,6 +130,8 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
popd &>/dev/null || die
+ # drop -Wl,--build-id from LDFLAGS, bug #465466
+ epatch "${FILESDIR}"/moz${PATCHFF:8:2}-drop-Wl-build-id.patch
# Shell scripts sometimes contain DOS line endings; bug 391889
grep -rlZ --include="*.sh" $'\r$' . |
next reply other threads:[~2013-09-26 16:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 16:34 Ian Stakenvicius [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-02-03 16:47 [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, www-client/seamonkey/, Nirbheek Chauhan
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=1380213262.b9ef50e665245324cc4025b096dc1b9c3c2edaa3.axs@gentoo \
--to=axs@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