From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21AB8138350 for ; Fri, 14 Feb 2020 02:34:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30722E083D; Fri, 14 Feb 2020 02:34:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01AF6E083D for ; Fri, 14 Feb 2020 02:34:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CE0D34ED9F for ; Fri, 14 Feb 2020 02:34:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF7DF138 for ; Fri, 14 Feb 2020 02:34:30 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1581647663.49a458e4b89270bb410f8bda5b31713f10e766bf.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/files/, www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/files/firefox-69.0-lto-gcc-fix.patch www-client/firefox/files/firefox-73.0_fix_lto_pgo_builds.patch www-client/firefox/firefox-73.0.ebuild X-VCS-Directories: www-client/firefox/ www-client/firefox/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 49a458e4b89270bb410f8bda5b31713f10e766bf X-VCS-Branch: master Date: Fri, 14 Feb 2020 02:34:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0e0d453e-2530-4775-94d6-431a98320cfc X-Archives-Hash: 02faac138edd4e508c5aa18858d0bd88 commit: 49a458e4b89270bb410f8bda5b31713f10e766bf Author: Jory Pratt gentoo org> AuthorDate: Fri Feb 14 02:34:23 2020 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri Feb 14 02:34:23 2020 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=49a458e4 www-client/firefox: Fix lto/pgo build Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Jory Pratt gentoo.org> .../firefox/files/firefox-69.0-lto-gcc-fix.patch | 26 ----------- .../files/firefox-73.0_fix_lto_pgo_builds.patch | 51 ++++++++++++++++++++++ www-client/firefox/firefox-73.0.ebuild | 2 + 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/www-client/firefox/files/firefox-69.0-lto-gcc-fix.patch b/www-client/firefox/files/firefox-69.0-lto-gcc-fix.patch deleted file mode 100644 index 9fe9673..0000000 --- a/www-client/firefox/files/firefox-69.0-lto-gcc-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# Parent 79ae951dc72ba16a2451c4cde7298aa986376b0c -Fix lto builds of sandbox on linux - -diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build ---- a/security/sandbox/linux/moz.build -+++ b/security/sandbox/linux/moz.build -@@ -95,17 +95,17 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc') - CXXFLAGS += ['-Wno-shadow'] - SOURCES['../chromium/sandbox/linux/services/syscall_wrappers.cc'].flags += [ - '-Wno-empty-body', - ] - - # gcc lto likes to put the top level asm in syscall.cc in a different partition - # from the function using it which breaks the build. Work around that by - # forcing there to be only one partition. --for f in CONFIG['OS_CXXFLAGS']: -+for f in CONFIG['MOZ_LTO_CFLAGS']: - if f.startswith('-flto') and CONFIG['CC_TYPE'] != 'clang': - LDFLAGS += ['--param', 'lto-partitions=1'] - - DEFINES['NS_NO_XPCOM'] = True - DisableStlWrapping() - - LOCAL_INCLUDES += ['/security/sandbox/linux'] - LOCAL_INCLUDES += ['/security/sandbox/chromium-shim'] diff --git a/www-client/firefox/files/firefox-73.0_fix_lto_pgo_builds.patch b/www-client/firefox/files/firefox-73.0_fix_lto_pgo_builds.patch new file mode 100644 index 0000000..5e2420c --- /dev/null +++ b/www-client/firefox/files/firefox-73.0_fix_lto_pgo_builds.patch @@ -0,0 +1,51 @@ +From c193eba68325c07bbf13eb3995842545b7d23695 Mon Sep 17 00:00:00 2001 +From: +Date: Thu, 13 Feb 2020 20:29:09 -0600 +Subject: [PATCH] Fix pgo/lto builds + +--- + build/moz.configure/lto-pgo.configure | 4 ++-- + security/sandbox/linux/moz.build | 5 ++--- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure +index 394c1d8911..1f26a6e565 100644 +--- a/build/moz.configure/lto-pgo.configure ++++ b/build/moz.configure/lto-pgo.configure +@@ -70,7 +70,7 @@ set_config('PGO_PROFILE_PATH', pgo_profile_path) + def pgo_flags(compiler, target, profdata): + if compiler.type == 'gcc': + return namespace( +- gen_cflags=['-fprofile-generate'], ++ gen_cflags=['-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'], + gen_ldflags=['-fprofile-generate'], + use_cflags=['-fprofile-use', '-fprofile-correction', + '-Wcoverage-mismatch'], +@@ -91,7 +91,7 @@ def pgo_flags(compiler, target, profdata): + gen_ldflags = ['-fprofile-generate'] + + return namespace( +- gen_cflags=[prefix + '-fprofile-generate'], ++ gen_cflags=[prefix + '-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'], + gen_ldflags=gen_ldflags, + use_cflags=[prefix + '-fprofile-use=%s' % profdata, + # Some error messages about mismatched profile data +diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build +index aae85843e9..e300260fa0 100644 +--- a/security/sandbox/linux/moz.build ++++ b/security/sandbox/linux/moz.build +@@ -100,9 +100,8 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + # gcc lto likes to put the top level asm in syscall.cc in a different partition + # from the function using it which breaks the build. Work around that by + # forcing there to be only one partition. +-for f in CONFIG['OS_CXXFLAGS']: +- if f.startswith('-flto') and CONFIG['CC_TYPE'] != 'clang': +- LDFLAGS += ['--param', 'lto-partitions=1'] ++if CONFIG['CC_TYPE'] != 'clang': ++ LDFLAGS += ['--param', 'lto-partitions=1'] + + DEFINES['NS_NO_XPCOM'] = True + DisableStlWrapping() +-- +2.25.0 + diff --git a/www-client/firefox/firefox-73.0.ebuild b/www-client/firefox/firefox-73.0.ebuild index a2025c3..c4fb0b2 100644 --- a/www-client/firefox/firefox-73.0.ebuild +++ b/www-client/firefox/firefox-73.0.ebuild @@ -257,6 +257,8 @@ src_prepare() { use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch" eapply "${WORKDIR}/firefox" + eapply "${FILESDIR}/${PN}-73.0_fix_lto_pgo_builds.patch" + # Allow user to apply any additional patches without modifing ebuild eapply_user