cull patches and rebase accordingly

bug1240930-253/mozilla/1298328-61a1.patch

@@ -36,24 +36,24 @@ diff --git a/Makefile.in b/Makefile.in
  endif
 +endif
  
- BUILD_BACKEND_FILES := $(addprefix backend.,$(addsuffix Backend,$(BUILD_BACKENDS)))
+ ifdef JS_STANDALONE
+ configure_dir = $(topsrcdir)/js/src
+ else
+ configure_dir = $(topsrcdir)
+ endif
  
- ifndef TEST_MOZBUILD
- ifndef MOZ_PROFILE_USE
- # We need to explicitly put BUILD_BACKEND_FILES here otherwise the rule in
- # rules.mk doesn't run early enough.
- $(TIERS) binaries:: CLOBBER $(BUILD_BACKEND_FILES)
+ BUILD_BACKEND_FILES := $(addprefix backend.,$(addsuffix Backend,$(BUILD_BACKENDS)))
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -241,16 +241,18 @@ extern void InstallSignalHandlers(const 
+@@ -237,16 +237,18 @@ extern void InstallSignalHandlers(const 
  
  #define FILE_COMPATIBILITY_INFO NS_LITERAL_CSTRING("compatibility.ini")
  #define FILE_INVALIDATE_CACHES NS_LITERAL_CSTRING(".purgecaches")
  #define FILE_STARTUP_INCOMPLETE NS_LITERAL_STRING(".startup-incomplete")
  
- int gArgc;
- char** gArgv;
+ int    gArgc;
+ char **gArgv;
  
 +#include "buildid.h"
 +
@@ -62,11 +62,11 @@ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
  
  static nsIProfileLock* gProfileLock;
  
- int gRestartArgc;
- char** gRestartArgv;
+ int    gRestartArgc;
+ char **gRestartArgv;
  
-@@ -271,22 +273,16 @@ nsString gAbsoluteArgv0Path;
- #endif
+@@ -264,22 +266,16 @@ nsString gAbsoluteArgv0Path;
+ #include <gtk/gtk.h>
  #ifdef MOZ_X11
  #include <gdk/gdkx.h>
  #endif /* MOZ_X11 */
@@ -85,6 +85,6 @@ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
  extern "C" MFBT_API bool IsSignalHandlingBroken();
  #endif
  
- #ifdef FUZZING
- #include "FuzzerRunner.h"
+ #ifdef LIBFUZZER
+ #include "LibFuzzerRunner.h"
  

bug1240930-253/mozilla/1454912-3-62a1.patch

@@ -59,7 +59,7 @@ diff --git a/config/config.mk b/config/config.mk
  GLOBAL_DEPS += backend.mk
  include backend.mk
  endif
-@@ -417,19 +420,16 @@ endif # ! WINNT
+@@ -429,19 +432,16 @@ endif # ! WINNT
  
  # Make sure any compiled classes work with at least JVM 1.4
  JAVAC_FLAGS += -source 1.4
@@ -123,7 +123,7 @@ diff --git a/python/mozbuild/mozbuild/action/file_generate.py b/python/mozbuild/
 diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
 --- a/python/mozbuild/mozbuild/backend/recursivemake.py
 +++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -538,16 +538,20 @@ class RecursiveMakeBackend(CommonBackend
+@@ -528,16 +528,20 @@ class RecursiveMakeBackend(CommonBackend
                  try:
                      outputs.append(o.format(**substs))
                  except KeyError as e:
@@ -140,11 +140,11 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              if obj.inputs:
                  if obj.localized:
                      # Localized generated files can have locale-specific inputs, which are
-                     # indicated by paths starting with `en-US/` or containing `/locales/en-US/`.
+                     # indicated by paths starting with `en-US/` or containing `locales/en-US/`.
                      def srcpath(p):
-                         if '/locales/en-US' in p:
-                             e, f = p.split('/locales/en-US/', 1)
-@@ -577,28 +581,30 @@ class RecursiveMakeBackend(CommonBackend
+                         if 'locales/en-US' in p:
+                             # We need an "absolute source path" relative to
+@@ -572,28 +576,30 @@ class RecursiveMakeBackend(CommonBackend
                  # If we're doing this during export that means we need it during
                  # compile, but if we have an artifact build we don't run compile,
                  # so we can skip it altogether or let the rule run as the result of
@@ -184,10 +184,10 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
 diff --git a/python/mozbuild/mozbuild/backend/tup.py b/python/mozbuild/mozbuild/backend/tup.py
 --- a/python/mozbuild/mozbuild/backend/tup.py
 +++ b/python/mozbuild/mozbuild/backend/tup.py
-@@ -593,16 +593,17 @@ class TupBackend(CommonBackend):
+@@ -276,16 +276,17 @@ class TupOnly(CommonBackend, PartialBack
+         if obj.script and obj.method and obj.relobjdir not in skip_directories:
+             backend_file.export_shell()
              cmd = self._py_action('file_generate')
-             if obj.localized:
-                 cmd.append('--locale=en-US')
              cmd.extend([
                  obj.script,
                  obj.method,
@@ -312,7 +312,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
          ]
  
          self.maxDiff = None
-@@ -469,58 +484,80 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -469,64 +484,86 @@ class TestRecursiveMakeBackend(BackendTe
      def test_localized_generated_files_force(self):
          """Ensure LOCALIZED_GENERATED_FILES with .force is handled properly."""
          env = self._consume('localized-generated-files-force', RecursiveMakeBackend)
@@ -345,7 +345,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
              '$(REPORT_BUILD)',
 -            '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main abc.xyz $(MDDEPDIR)/abc.xyz.pp $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input)' % env.topsrcdir,
 +            '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main abc.xyz $(MDDEPDIR)/abc.xyz.pp $(MDDEPDIR)/abc.xyz.stub $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input)' % env.topsrcdir,
-+            '@$(TOUCH) $@',
+++            '@$(TOUCH) $@',
              '',
          ]
  
@@ -379,13 +379,19 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
              'GARBAGE += bar$(AB_rCD).xyz',
 +            'GARBAGE += $(MDDEPDIR)/bar$(AB_rCD).xyz.stub'
              'EXTRA_MDDEPEND_FILES += bar$(AB_rCD).xyz.pp',
--            'bar$(AB_rCD).xyz: %s/generate-foo.py $(call MERGE_RELATIVE_FILE,localized-input,/locales/inner) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,
+-            'bar$(AB_rCD).xyz: %s/generate-foo.py $(call MERGE_RELATIVE_FILE,localized-input,inner/locales) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,
 +            '$(MDDEPDIR)/bar$(AB_rCD).xyz.stub: %s/generate-foo.py $(call MERGE_RELATIVE_FILE,localized-input,inner/locales) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,
              '$(REPORT_BUILD)',
--            '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main bar$(AB_rCD).xyz $(MDDEPDIR)/bar$(AB_rCD).xyz.pp $(call MERGE_RELATIVE_FILE,localized-input,/locales/inner) $(srcdir)/non-localized-input)' % env.topsrcdir,
+-            '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main bar$(AB_rCD).xyz $(MDDEPDIR)/bar$(AB_rCD).xyz.pp $(call MERGE_RELATIVE_FILE,localized-input,inner/locales) $(srcdir)/non-localized-input)' % env.topsrcdir,
 +            '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main bar$(AB_rCD).xyz $(MDDEPDIR)/bar$(AB_rCD).xyz.pp $(MDDEPDIR)/bar$(AB_rCD).xyz.stub $(call MERGE_RELATIVE_FILE,localized-input,inner/locales) $(srcdir)/non-localized-input)' % env.topsrcdir,
 +            '@$(TOUCH) $@',
              '',
+             'GARBAGE += zot$(AB_rCD).xyz',
+             'EXTRA_MDDEPEND_FILES += zot$(AB_rCD).xyz.pp',
+             'zot$(AB_rCD).xyz: %s/generate-foo.py $(call MERGE_RELATIVE_FILE,localized-input,locales) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,
+             '$(REPORT_BUILD)',
+             '$(call py_action,file_generate,--locale=$(AB_CD) %s/generate-foo.py main zot$(AB_rCD).xyz $(MDDEPDIR)/zot$(AB_rCD).xyz.pp $(call MERGE_RELATIVE_FILE,localized-input,locales) $(srcdir)/non-localized-input)' % env.topsrcdir,
+             '',
 +            'zot$(AB_rCD).xyz: $(MDDEPDIR)/zot$(AB_rCD).xyz.stub ;',
 +            'GARBAGE += zot$(AB_rCD).xyz',
 +            'GARBAGE += $(MDDEPDIR)/zot$(AB_rCD).xyz.stub',

bug1240930-253/mozilla/1455504-62a1.patch

@@ -10,9 +10,9 @@ MozReview-Commit-ID: DuZaGMKVZrn
 diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
 --- a/python/mozbuild/mozbuild/backend/recursivemake.py
 +++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1295,18 +1295,19 @@ class RecursiveMakeBackend(CommonBackend
-     def _process_host_shared_library(self, libdef, backend_file):
-         backend_file.write('HOST_SHARED_LIBRARY = %s\n' % libdef.lib_name)
+@@ -1280,18 +1280,19 @@ class RecursiveMakeBackend(CommonBackend
+     def _process_host_library(self, libdef, backend_file):
+         backend_file.write('HOST_LIBRARY_NAME = %s\n' % libdef.basename)
  
      def _build_target_for_obj(self, obj):
          return '%s/%s' % (mozpath.relpath(obj.objdir,
@@ -32,13 +32,13 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
  
          objs, no_pgo_objs, shared_libs, os_libs, static_libs = self._expand_libs(obj)
  
-@@ -1368,34 +1369,34 @@ class RecursiveMakeBackend(CommonBackend
-                                                          pgo_list_file_path)
-                 backend_file.write_once('%s_PGO_OBJS := %s\n' %
-                                         (obj.name, pgo_list_file_ref))
-                 backend_file.write_once('%s: %s\n' % (obj_target,
-                                                       pgo_list_file_path))
-             write_obj_deps(obj_target, objs_ref, pgo_objs_ref)
+@@ -1352,34 +1353,35 @@ class RecursiveMakeBackend(CommonBackend
+                                                              pgo_list_file_path)
+                     backend_file.write_once('%s_PGO_OBJS := %s\n' %
+                                             (obj.name, pgo_list_file_ref))
+                     backend_file.write_once('%s: %s\n' % (obj_target,
+                                                           pgo_list_file_path))
+                 write_obj_deps(obj_target, objs_ref, pgo_objs_ref)
  
          for lib in shared_libs:
 -            backend_file.write_once('SHARED_LIBS += %s/%s\n' %
@@ -60,12 +60,13 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              if not isinstance(lib, ExternalLibrary):
                  self._compile_graph[build_target].add(
                      self._build_target_for_obj(lib))
--            if isinstance(lib, HostRustLibrary):
+-            if isinstance(lib, (HostLibrary, HostRustLibrary)):
 -                backend_file.write_once('HOST_LIBS += %s/%s\n' %
 -                                        (pretty_relpath(lib), lib.import_name))
 +            if isinstance(lib, (HostRustLibrary)):
 +                backend_file.write_once('HOST_LIBS += %s\n' %
-+                                        pretty_relpath(lib, lib.import_name))
++                                        pretty_relpath(lib, lib.import_name)
++
  
          # We have to link any Rust libraries after all intermediate static
          # libraries have been listed to ensure that the Rust libraries are
@@ -74,7 +75,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              self._process_rust_libraries(obj, backend_file, pretty_relpath)
  
          # Process library-based defines
-@@ -1410,18 +1411,18 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1394,18 +1396,18 @@ class RecursiveMakeBackend(CommonBackend
              return
  
          # We should have already checked this in Linkable.link_library.
@@ -98,7 +99,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
 diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
 --- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
 +++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
-@@ -1042,44 +1042,45 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -1043,44 +1043,45 @@ class TestRecursiveMakeBackend(BackendTe
  
              for line in lines:
                  self.assertNotIn('LIB_IS_C_ONLY', line)
@@ -151,7 +152,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
                      self.assertNotIn('%s +=' % var, line)
  
      def test_list_files(self):
-@@ -1092,21 +1093,21 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -1093,21 +1094,21 @@ class TestRecursiveMakeBackend(BackendTe
              ],
              'shared/baz_so.list': [
                  'baz/baz1.o',

bug1240930-253/mozilla/1461383-62a1.patch

@@ -7,26 +7,6 @@ Bug 1461383 - fix test_build.py for local builds; r=chmanchester,f=mshal
 
 test_build.py fails on local builds with messages like:
 
-make[4]: Entering directory '/tmp/tmp65BjCH'
-make[4]: *** No rule to make target 'buildid.h'.  Stop.
-make[4]: Leaving directory '/tmp/tmp65BjCH'
-/home/froydnj/src/gecko-dev.git/config/faster/rules.mk:76: recipe for target '/tmp/tmp65BjCH/buildid.h' failed
-make[3]: *** [/tmp/tmp65BjCH/buildid.h] Error 2
-make[3]: *** Waiting for unfinished jobs....
-make[4]: Entering directory '/tmp/tmp65BjCH'
-make[4]: *** No rule to make target 'source-repo.h'.  Stop.
-make[4]: Leaving directory '/tmp/tmp65BjCH'
-/home/froydnj/src/gecko-dev.git/config/faster/rules.mk:76: recipe for target '/tmp/tmp65BjCH/source-repo.h' failed
-make[3]: *** [/tmp/tmp65BjCH/source-repo.h] Error 2
-make[3]: Leaving directory '/tmp/tmp65BjCH/faster'
-Makefile:155: recipe for target 'faster' failed
-
-The tests pass in automation, however, because automation always defines
-the rules for buildid.h and source-repo.h in the toplevel Makefile.in.
-For local builds, however, those rules are not defined to avoid build
-churn.  Let's ensure that the necessary rules are defined during testing
-as well.
-
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -47,7 +27,7 @@ diff --git a/Makefile.in b/Makefile.in
  endif
  endif
  
- BUILD_BACKEND_FILES := $(addprefix backend.,$(addsuffix Backend,$(BUILD_BACKENDS)))
- 
- ifndef TEST_MOZBUILD
- ifndef MOZ_PROFILE_USE
+ ifdef JS_STANDALONE
+ configure_dir = $(topsrcdir)/js/src
+ else
+ configure_dir = $(topsrcdir)

bug1240930-253/mozilla/1470552-62a1.patch

@@ -30,8 +30,8 @@ diff --git a/Makefile.in b/Makefile.in
  endif
  endif
  
- BUILD_BACKEND_FILES := $(addprefix backend.,$(addsuffix Backend,$(BUILD_BACKENDS)))
- 
- ifndef TEST_MOZBUILD
- ifndef MOZ_PROFILE_USE
- # We need to explicitly put BUILD_BACKEND_FILES here otherwise the rule in
+ ifdef JS_STANDALONE
+ configure_dir = $(topsrcdir)/js/src
+ else
+ configure_dir = $(topsrcdir)
+ endif

bug1240930-253/mozilla/series-append

@@ -10,27 +10,18 @@
 1429875-3-61a1.patch
 1429875-4-61a1.patch
 1429875-5-61a1.patch
-1457524-1-61a1.patch
-1457524-2-61a1.patch
-1457524-3-61a1.patch
-1457524-4-61a1.patch
-1457524-5-61a1.patch
-1457524-6-61a1.patch
 1443208-1only-62a1.patch
 1455504-62a1.patch
 1454912-2no1-62a1.patch
 1454912-3-62a1.patch
 1454912-4-62a1.patch
-1461881-62a1.patch
 1298328-61a1.patch
 1461383-62a1.patch
 1470552-62a1.patch
-1469067-62a1.patch
 1642032-1-79a1.patch
 1642032-2-79a1.patch
 1642032-3-79a1.patch
 1464128-62a1.patch
-1464381-62a1.patch
 1437942-62a1.patch
 1240930-80a1.patch
 1457321-1only-62a1.patch

bug1240930-253/mozilla/series-old

@@ -0,0 +1,36 @@
+1443204-1only-60a1.patch
+1255485-1-61a1.patch
+1255485-2-61a1.patch
+1255485-3-61a1.patch
+1255485-4-61a1.patch
+1255485-5-61a1.patch
+1255485-6-61a1.patch
+1429875-1-61a1.patch
+1429875-2-61a1.patch
+1429875-3-61a1.patch
+1429875-4-61a1.patch
+1429875-5-61a1.patch
+1457524-1-61a1.patch
+1457524-2-61a1.patch
+1457524-3-61a1.patch
+1457524-4-61a1.patch
+1457524-5-61a1.patch
+1457524-6-61a1.patch
+1443208-1only-62a1.patch
+1455504-62a1.patch
+1454912-2no1-62a1.patch
+1454912-3-62a1.patch
+1454912-4-62a1.patch
+1461881-62a1.patch
+1298328-61a1.patch
+1461383-62a1.patch
+1470552-62a1.patch
+1469067-62a1.patch
+1642032-1-79a1.patch
+1642032-2-79a1.patch
+1642032-3-79a1.patch
+1464128-62a1.patch
+1464381-62a1.patch
+1437942-62a1.patch
+1240930-80a1.patch
+1457321-1only-62a1.patch