[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/

[Thomas Deutschmann]

commit:     2a81c67c8f8f2e7bbfeaf8fe68a236d3698e5d71
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 22:53:20 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 22:55:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a81c67c

www-client/firefox: improve switching toolchain

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-client/firefox/Manifest                |  2 +-
 www-client/firefox/firefox-82.0_rc2.ebuild | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 3a4cd8f9980..6419686b56f 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -288,7 +288,7 @@ DIST firefox-81.0.2-xh.xpi 427853 BLAKE2B 
5d93dbf61b010824f264e151bb84b873cd2988
 DIST firefox-81.0.2-zh-CN.xpi 554377 BLAKE2B 
75ec97232f9558a766e34e6cbb1ec193015dbafa6992d30a464c85190523228b3dd5dfdd055240ae42d74c96451eb9ae641a500f85334735370978e7d5ea0394
 SHA512 
66bff2c6fceb2731873e596eafe8d26a9c5eca5e9865c9acbf7e4fea9797ec599ac8c2035ff8b8b4e9052c1960d9bee23b956e59a5d107f709eb6a68e82f03c8
 DIST firefox-81.0.2-zh-TW.xpi 554162 BLAKE2B 
d2ccc9d7358374864f9936a37b78f05f7161d501a627fdaa3e777ddeab95df93a491fc7ba792e4814c3cdf43f27318c1273e97a269a7dece4c052cc07c9e29c7
 SHA512 
e2b2ccc71a72e47bdbd485465c7edd73575e5a54a25fca4a13acd72473ea648abdfb4e3e717efd6910ef9b05f5e6b99d90c84488321be87b2609068461d29a1f
 DIST firefox-81.0.2.source.tar.xz 337759612 BLAKE2B 
18ba8f61b4ad5c42328d1938a36e6e438c528ba669ae841074bff0a3a40194836d818421b464051299fdd6e70af769177981550c66501e1ad242813e2c8f8426
 SHA512 
8a3ef4819120e93b860344ef05b4ef05262e3f127053ef66b3c1eb4b157932913f72fd4ba5500e86c2ef29f25be58e0c6e2c47a1c1ecde2abe77ece5f948fd75
-DIST firefox-82-patches-01.tar.xz 31232 BLAKE2B 
b2305a8c158ac0522da058a622e27b571b5b7425e8205cb5d3642c2d52571c05d19c450da1f165b5090a9c03bf179fc2097af3bff7a64f862ed4b72ae8fbbbb8
 SHA512 
e8e8f83e2a10e9ab50e3845defa74bc3fd53a391ee13e1495180d65eebf82f0d7669a23d04f6afdf737d31d6157d788d5e8adde311cd0058a2969ca960224d8b
+DIST firefox-82-patches-01.tar.xz 31208 BLAKE2B 
e36f2b27db38b5f2f2104c66d504aa8b495e261e0faef83c1a65c8d69face4296d4cfc122201c7f36dde1c3a401f71b75bbf22f3fc07d05e1fb1a5e21b459e66
 SHA512 
25b6ed1215f621f97480be1f7db97c6458527dbc8d92ec52968a6f6ba0ba9df14ec085440283064cd840057964b2d0570563497689b03c69ccd0635967e52790
 DIST firefox-82.0_rc2-ach.xpi 460143 BLAKE2B 
e84f40cd625090808c8b316e20639d2127e98da9d1840523a8b0f588c57970c0e860a87919d468ffeb44b0272f4d1cd79203a8fe4abb49c95ec45e91b6eeebe0
 SHA512 
2ccb9345398a88d336bfa7827109b19e8da8fcea840ab435cf3559534b8b6cc71977793333663cfb1fffd7e85532d961a6eaa8114e521f583303650cd4b9e0df
 DIST firefox-82.0_rc2-af.xpi 430109 BLAKE2B 
b2b68c38ac503422e7bc95b88381b10793189955069f549a54c64e55281e661a515f81abc16bdcc0f08ffc77a0ad616ff83fa12f4b0a45030e76f09d668bd7bd
 SHA512 
130fef6e8aa2890876254d916c80fec88476241fadda53b6ed62278544ff3415ebd8427eaba007d5298df8ca20dc0e90ff656f7c2d8fd67952b08dc9b7de4382
 DIST firefox-82.0_rc2-an.xpi 510114 BLAKE2B 
c0e8ea7982002ef714849f7b08b650c4ac52441bfd3682a8b64b5f626753b20cb07d2f513800cb78798133c1276b6d1dab9fc75e48496cf9d569b555b500424f
 SHA512 
a1dcc7576e8f4543ae525f13dfc23aec788e9c2159d06d4ed15457602a46cfdacb1067a92b56f054cc7234c4d2a74a300731bd835e15b3c94fbfb06ffb68c4ec

diff --git a/www-client/firefox/firefox-82.0_rc2.ebuild 
b/www-client/firefox/firefox-82.0_rc2.ebuild
index 603d38cf352..6f569bcea91 100644
--- a/www-client/firefox/firefox-82.0_rc2.ebuild
+++ b/www-client/firefox/firefox-82.0_rc2.ebuild
@@ -528,14 +528,20 @@ src_configure() {
                # Force clang
                einfo "Enforcing the use of clang due to USE=clang ..."
                have_switched_compiler=yes
+               AR=llvm-ar
                CC=${CHOST}-clang
                CXX=${CHOST}-clang++
+               NM=llvm-nm
+               RANLIB=llvm-ranlib
        elif ! use clang && ! tc-is-gcc ; then
                # Force gcc
                have_switched_compiler=yes
                einfo "Enforcing the use of gcc due to USE=-clang ..."
+               AR=gcc-ar
                CC=${CHOST}-gcc
                CXX=${CHOST}-g++
+               NM=gcc-nm
+               RANLIB=gcc-ranlib
        fi
 
        if [[ -n "${have_switched_compiler}" ]] ; then
@@ -577,6 +583,11 @@ src_configure() {
 
                if use pgo ; then
                        mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+                       if use clang ; then
+                               # Used in build/pgo/profileserver.py
+                               export LLVM_PROFDATA="llvm-profdata"
+                       fi
                fi
        else
                # Avoid auto-magic on linker