[arch-commits] Commit in firefox/trunk (3 files)

[Jan Steffens]

    Date: Thursday, October 3, 2019 @ 22:29:23
  Author: heftig
Revision: 363719

Use a proper patch for the relinking issue

Added:
  firefox/trunk/no-relinking.patch
Modified:
  firefox/trunk/PKGBUILD
Deleted:
  firefox/trunk/hack-buildsymbols.patch

-------------------------+
 PKGBUILD                |    8 +++----
 hack-buildsymbols.patch |   47 ----------------------------------------------
 no-relinking.patch      |   41 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-03 21:46:19 UTC (rev 363718)
+++ PKGBUILD	2019-10-03 22:29:23 UTC (rev 363719)
@@ -21,12 +21,12 @@
             'hunspell-en_US: Spell checking, American English')
 options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
-        hack-buildsymbols.patch
+        no-relinking.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop firefox-symbolic.svg)
 sha256sums=('2904ef954626d2a7f320670ccb7cb5d9060610f091c94190a6cbee14aa2cd82e'
             'SKIP'
-            'f16c614ab7268176021eba63050bf6018c9ebeebc419c5db62480f867c7c7535'
+            '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014'
             'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
             'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797')
@@ -48,8 +48,8 @@
   mkdir mozbuild
   cd firefox-$pkgver
 
-  # Do symbol dumping during compile
-  patch -Np1 -i ../hack-buildsymbols.patch
+  # Avoid relinking during buildsymbols
+  patch -Np1 -i ../no-relinking.patch
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch

Deleted: hack-buildsymbols.patch
===================================================================
--- hack-buildsymbols.patch	2019-10-03 21:46:19 UTC (rev 363718)
+++ hack-buildsymbols.patch	2019-10-03 22:29:23 UTC (rev 363719)
@@ -1,47 +0,0 @@
-diff --git i/Makefile.in w/Makefile.in
-index 626edae551d3..781e41269723 100644
---- i/Makefile.in
-+++ w/Makefile.in
-@@ -239,7 +239,7 @@ prepsymbolsarchive:
- 	echo packing symbols
- 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
- 
--ifndef MOZ_AUTOMATION
-+ifndef MOZ_PROFILE_USE
- prepsymbolsarchive: recurse_syms
- endif
- 
-diff --git i/config/recurse.mk w/config/recurse.mk
-index ed2e187061aa..379b9042a8e4 100644
---- i/config/recurse.mk
-+++ w/config/recurse.mk
-@@ -76,11 +76,9 @@ $(compile_targets) $(syms_targets):
- $(syms_targets): %/syms: %/target
- 
- # Only hook symbols targets into the main compile graph in automation.
--ifdef MOZ_AUTOMATION
--ifeq (1,$(MOZ_AUTOMATION_BUILD_SYMBOLS))
-+ifdef MOZ_PROFILE_USE
- recurse_compile: $(syms_targets)
- endif
--endif
- 
- # Create a separate rule that depends on every 'syms' target so that
- # symbols can be dumped on demand locally.
-diff --git i/config/rules.mk w/config/rules.mk
-index fefe2805fb92..b5641eae15ba 100644
---- i/config/rules.mk
-+++ w/config/rules.mk
-@@ -750,11 +750,9 @@ DUMP_SYMS_TARGETS := $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS)
- endif
- endif
- 
--ifdef MOZ_AUTOMATION
--ifeq (,$(filter 1,$(MOZ_AUTOMATION_BUILD_SYMBOLS)))
-+ifdef MOZ_PROFILE_GENERATE
- DUMP_SYMS_TARGETS :=
- endif
--endif
- 
- ifdef MOZ_COPY_PDBS
- MAIN_PDB_FILES = $(addsuffix .pdb,$(basename $(DUMP_SYMS_TARGETS)))

Added: no-relinking.patch
===================================================================
--- no-relinking.patch	                        (rev 0)
+++ no-relinking.patch	2019-10-03 22:29:23 UTC (rev 363719)
@@ -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)
+