Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/
Date: Sun, 30 Sep 2018 20:06:01
Message-Id: 1538337941.01612f827733459b9d378e60ad895d1365fac20d.whissi@gentoo
1 commit: 01612f827733459b9d378e60ad895d1365fac20d
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 30 19:38:38 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 30 20:05:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01612f82
7
8 www-client/firefox: disable elf-hack when USE=clang
9
10 Bug: https://bugs.gentoo.org/667216
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12 Package-Manager: Portage-2.3.50, Repoman-2.3.11
13
14 www-client/firefox/firefox-60.2.1-r1.ebuild | 5 +++++
15 www-client/firefox/firefox-62.0.2.ebuild | 5 +++++
16 2 files changed, 10 insertions(+)
17
18 diff --git a/www-client/firefox/firefox-60.2.1-r1.ebuild b/www-client/firefox/firefox-60.2.1-r1.ebuild
19 index 944c98fcc47..731dc4e13ce 100644
20 --- a/www-client/firefox/firefox-60.2.1-r1.ebuild
21 +++ b/www-client/firefox/firefox-60.2.1-r1.ebuild
22 @@ -240,6 +240,11 @@ src_configure() {
23
24 mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
25
26 + if use clang ; then
27 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
28 + mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
29 + fi
30 +
31 echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
32 echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
33
34
35 diff --git a/www-client/firefox/firefox-62.0.2.ebuild b/www-client/firefox/firefox-62.0.2.ebuild
36 index e83a43676a4..6390b7d1235 100644
37 --- a/www-client/firefox/firefox-62.0.2.ebuild
38 +++ b/www-client/firefox/firefox-62.0.2.ebuild
39 @@ -421,6 +421,11 @@ src_configure() {
40
41 mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
42
43 + if use clang ; then
44 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
45 + mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
46 + fi
47 +
48 echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
49 echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig