[arch-commits] Commit in firefox-developer-edition/trunk (PKGBUILD no-relinking.patch)

[Andrew Crerar]

    Date: Tuesday, October 8, 2019 @ 20:24:49
  Author: andrewsc
Revision: 514275

upgpkg: firefox-developer-edition 70.0b13-1

firefox-developer-edition: Adding patch for relinking issue, updating to 70.0b13

Added:
  firefox-developer-edition/trunk/no-relinking.patch
Modified:
  firefox-developer-edition/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   28 +++++++++++++++++++---------
 no-relinking.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-08 19:23:40 UTC (rev 514274)
+++ PKGBUILD	2019-10-08 20:24:49 UTC (rev 514275)
@@ -2,7 +2,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=firefox-developer-edition
-pkgver=70.0b12
+pkgver=70.0b13
 pkgrel=1
 pkgdesc="Developer Edition of the popular Firefox web browser"
 arch=('x86_64')
@@ -23,13 +23,16 @@
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         firefox-install-dir.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
-        "$pkgname".desktop firefox-symbolic.svg)
-sha512sums=('68e0b33611eec09582187bc480ba64b649e2dae31e6e2383239fddfe17542fbdffb5930ff77e00f0aa84ea70616515b1dc6bac1195f51ab2fd7e11372a31a745'
+        "$pkgname".desktop
+        firefox-symbolic.svg
+        no-relinking.patch)
+sha512sums=('0aa7829ff3ae0427f9ccb7f73b90162dfde9d8b13feb081431d15c96892aaaabcd138e4cbbff951c9a9d2ecd34e2a6194945060619cad2f44bd809df590562b4'
             'SKIP'
             'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e'
             '40c931b8abbe5880122dbcc93d457e04e9b4f2bc3e0275e9e3e35dd347fe0658f9446c89e99553203be8a8c9ab6f4ca872a7aedc514920c107b9235c04df91dc'
             'c212158fe76b1e6228adba9214e2881458b81f38564149719dd18b121f962285bf54603a5bea93c27cb09be851b1d70091a2ce2eb5294c9d75f7619e06d549be'
-            'ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8')
+            'ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8'
+            'af9857cd697748b9d2142da2ed8f2de1bdc7d94a0b1fd0b20bb45c7d356441e1ad152f166fa843e1f3781d3ead2ec64ff509862818eaae2e9f61264501a699a1')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -42,7 +45,7 @@
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
 # get your own set of keys. Feel free to contact heftig at archlinux.org for
 # more information.
-_mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
+_mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a
 
 prepare() {
   mkdir mozbuild
@@ -52,6 +55,9 @@
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
+  # Avoid relinking during buildsymbols
+  patch -Np1 -i ../no-relinking.patch
+
   echo -n "$_google_api_key" > google-api-key
   echo -n "$_mozilla_api_key" > mozilla-api-key
 
@@ -98,6 +104,7 @@
 ac_add_options --enable-crashreporter
 ac_add_options --disable-gconf
 ac_add_options --disable-updater
+ac_add_options --disable-tests
 END
 }
 
@@ -122,9 +129,10 @@
 END
   ./mach build
 
-  msg2 "Profiling browser..."
+  msg2 "Profiling instrumented browser..."
   ./mach package
-  JARLOG_FILE="$PWD/jarlog" \
+  LLVM_PROFDATA=llvm-profdata \
+    JARLOG_FILE="$PWD/jarlog" \
     xvfb-run -a -n 92 -s "-screen 0 1600x1200x24" \
     ./mach python build/pgo/profileserver.py
 
@@ -138,14 +146,16 @@
     return 1
   fi
 
+  msg2 "Removing instrumented browser..."
+  ./mach clobber
+
   msg2 "Building optimized browser..."
   cat >.mozconfig ../mozconfig - <<END
-ac_add_options --enable-lto
+ac_add_options --enable-lto=cross
 ac_add_options --enable-profile-use=cross
 ac_add_options --with-pgo-profile-path=${PWD at Q}
 ac_add_options --with-pgo-jarlog=${PWD at Q}/jarlog
 END
-
   ./mach build
 
   msg2 "Building symbol archive..."

Added: no-relinking.patch
===================================================================
--- no-relinking.patch	                        (rev 0)
+++ no-relinking.patch	2019-10-08 20:24:49 UTC (rev 514275)
@@ -0,0 +1,41 @@
+
+# HG changeset patch
+# User Mike Shal <mshal at mozilla.com>
+# Date 1570127498 25200
+# Node ID b8bc2504f108d8a2216ee11405cbbe4cf7a0eaec
+# Parent  9a4d6aacc48080f019024c02ac7da1fd576b39fe
+Bug XYZ - Only force re-linking on 1-tier PGO builds; r?#firefox-build-system-reviewers
+
+
+diff --git a/config/rules.mk b/config/rules.mk
+--- a/config/rules.mk
++++ b/config/rules.mk
+@@ -465,25 +465,27 @@ ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
+ 	$(foreach pgd,$(wildcard *.pgd),pgomgr -clear $(pgd);)
+ else
+ ifdef GNU_CC
+ 	-$(RM) *.gcda
+ endif
+ endif
+ endif
+ 
++ifdef MOZ_1TIER_PGO
+ ifneq (,$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
+ ifneq (,$(filter target,$(MAKECMDGOALS)))
+ ifdef GNU_CC
+ # Force rebuilding libraries and programs in both passes because each
+ # pass uses different object files.
+ $(PROGRAM) $(SHARED_LIBRARY) $(LIBRARY): FORCE
+ endif
+ endif
+ endif
++endif
+ 
+ endif # NO_PROFILE_GUIDED_OPTIMIZE
+ 
+ ##############################################
+ 
+ clean clobber realclean clobber_all::
+ 	-$(RM) $(ALL_TRASH)
+ 	-$(RM) -r $(ALL_TRASH_DIRS)
+