From d175d93ecc5633244db18606d9c6b371054161dd Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Wed, 28 Jun 2023 08:28:09 +0200
Subject: [PATCH] PGO update

---
 firefox.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index b5f491e..b4fc86c 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -236,6 +236,7 @@ Patch407:        mozilla-1667096.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
+Patch602:        mozilla-1516803.patch
 Patch603:        firefox-gcc-always-inline.patch
 
 # tentative patch for RUSTFLAGS parsing issue:
@@ -509,6 +510,7 @@ This package contains results of tests executed during build.
 %if %{build_with_pgo}
 %if !%{build_with_clang}
 %patch600 -p1 -b .pgo
+%patch602 -p1 -b .1516803
 %endif
 %endif
 %patch603 -p1 -b .inline
@@ -626,7 +628,7 @@ chmod a-x third_party/rust/ash/src/extensions/nv/*.rs
 %build
 # Disable LTO to work around rhbz#1883904
 # Is that already fixed?
-# %define _lto_cflags %{nil}
+%define _lto_cflags %{nil}
 
 %if 0%{?use_bundled_cbindgen}
 mkdir -p my_rust_vendor
@@ -725,13 +727,21 @@ echo "mk_add_options MOZ_MAKE_FLAGS=\"-j%{_smp_build_ncpus}\"" >> .mozconfig
 
 echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .mozconfig
 echo "export STRIP=/bin/true" >> .mozconfig
-#export MACH_USE_SYSTEM_PYTHON=1
 
 %if %{launch_wayland_compositor}
 cp %{SOURCE45} .
 . ./run-wayland-compositor
 %endif
 
+export MACH_NATIVE_PACKAGE_SOURCE=system
+mkdir -p objdir/_virtualenvs/init_py3
+cat > objdir/_virtualenvs/init_py3/pip.conf << EOF
+[global]
+find-links=`pwd`/mochitest-python
+no-index=true
+EOF
+tar xf %{SOURCE37}
+
 %if %{build_with_pgo}
 %if %{test_on_wayland}
 env | grep "WAYLAND"
@@ -746,20 +756,14 @@ xvfb-run ./mach build -v 2>&1 | cat - || exit 1
 #---------------------------------------------------------------------
 %install
 # run Firefox test suite
-export MACH_USE_SYSTEM_PYTHON=1
+# Do we need it?
+export MACH_NATIVE_PACKAGE_SOURCE=system
 %if %{launch_wayland_compositor}
 cp %{SOURCE45} .
 . ./run-wayland-compositor
 %endif
 
 %if 0%{?run_firefox_tests}
-mkdir -p objdir/_virtualenvs/init_py3
-cat > objdir/_virtualenvs/init_py3/pip.conf << EOF
-[global]
-find-links=`pwd`/mochitest-python
-no-index=true
-EOF
-tar xf %{SOURCE37}
 cp %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE38} %{SOURCE39} %{SOURCE43} %{SOURCE44} .
 mkdir -p test_results
 %if %{test_on_wayland}