From ef3bf44d9e448224c7d749731160b6916cc83006 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 6 Oct 2020 21:49:08 +0200 Subject: [PATCH] Added pgo build fix --- firefox.spec | 2 ++ pgo-build-python.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pgo-build-python.patch diff --git a/firefox.spec b/firefox.spec index 5e0e45f..f7eea27 100644 --- a/firefox.spec +++ b/firefox.spec @@ -157,6 +157,7 @@ Patch48: build-arm-wasm.patch Patch49: build-arm-libaom.patch #Patch50: Bug-1610814-Fix-NEON-compile-error-with-gcc-and-RGB-.patch Patch53: firefox-gcc-build.patch +Patch54: pgo-build-python.patch # Fedora specific patches Patch215: firefox-enable-addons.patch @@ -369,6 +370,7 @@ This package contains results of tests executed during build. %patch49 -p1 -b .build-arm-libaom #%patch50 -p1 -b .build-arm-SwizzleNEON %patch53 -p1 -b .firefox-gcc-build +%patch54 -p1 -b .pgo-build-python # Fedora patches %patch215 -p1 -b .addons diff --git a/pgo-build-python.patch b/pgo-build-python.patch new file mode 100644 index 0000000..2d79542 --- /dev/null +++ b/pgo-build-python.patch @@ -0,0 +1,15 @@ +diff -up firefox-81.0.1/build/mach_bootstrap.py.old firefox-81.0.1/build/mach_bootstrap.py +--- firefox-81.0.1/build/mach_bootstrap.py.old 2020-10-06 14:16:06.212974910 +0200 ++++ firefox-81.0.1/build/mach_bootstrap.py 2020-10-06 14:19:03.313179557 +0200 +@@ -507,7 +507,10 @@ class ImportHook(object): + # doesn't happen or because it doesn't matter). + if not os.path.exists(module.__file__[:-1]): + if os.path.exists(module.__file__): +- os.remove(module.__file__) ++ try: ++ os.remove(module.__file__) ++ except: ++ pass + del sys.modules[module.__name__] + module = self(name, globals, locals, fromlist, level) +