Accepting request 854531 from home:marxin:branches:mozilla:Factory

- PGO is still broken as can be seen here:
  https://bugzilla.mozilla.org/show_bug.cgi?id=1680306

OBS-URL: https://build.opensuse.org/request/show/854531
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=879
This commit is contained in:
Wolfgang Rosenauer 2020-12-10 12:07:53 +00:00 committed by Git OBS Bridge
parent ae9afbb746
commit 1a48836fb2
3 changed files with 8 additions and 15 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Dec 10 10:54:04 UTC 2020 - Martin Liška <mliska@suse.cz>
- PGO is still broken as can be seen here:
https://bugzilla.mozilla.org/show_bug.cgi?id=1680306
-------------------------------------------------------------------
Tue Dec 8 09:50:23 UTC 2020 - Martin Liška <mliska@suse.cz>

View File

@ -37,7 +37,8 @@
%define branding 1
%define devpkg 1
%define do_profiling 1
# PGO builds do not work in TW currently (bmo#1680306)
%define do_profiling 0
# upstream default is clang (to use gcc for large parts set to 0)
%define clang_build 0
@ -215,7 +216,6 @@ Patch29: revert-795c8762b16b.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch
Patch103: fix-gcc-pgo.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils
@ -358,7 +358,6 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
# Firefox
%patch101 -p1
%patch102 -p1
%patch103 -p1
%endif
%build

View File

@ -1,12 +0,0 @@
--- ./build/pgo/profileserver.py 2020-12-02 15:34:46.453053287 +0100
+++ ./build/pgo/profileserver.py 2020-12-02 15:34:57.988970433 +0100
@@ -203,7 +203,8 @@
sys.exit(1)
llvm_profdata = env.get('LLVM_PROFDATA')
- if llvm_profdata:
+ cc = env.get('CC')
+ if llvm_profdata and not 'gcc' in cc:
profraw_files = glob.glob('*.profraw')
if not profraw_files:
print('Could not find profraw files in the current directory: %s' % os.getcwd())