Browse Source

ignore maintenance-service optiong for non-windows.

Bill Gianopoulos 3 years ago
parent
commit
4cc699aef9

+ 1 - 1
frg-buildfixes/comm/series

@@ -316,7 +316,7 @@ WIP-1655362-default-zoom-v3.patch
 1645892-1-port1475647-257.patch
 1645892-1-port1475647-257.patch
 1645892-2-port1468222-257.patch
 1645892-2-port1468222-257.patch
 1646495-remove-nsIHTTPIndex-v1_1-257.patch
 1646495-remove-nsIHTTPIndex-v1_1-257.patch
-#9999999-disablemaint-comm-257.patch
+9999999-disablemaint-comm-257.patch
 1600103-port296655-257.patch
 1600103-port296655-257.patch
 1673959-subscribe-1425962-257.patch
 1673959-subscribe-1425962-257.patch
 1673959-subscribe-1466705-257.patch
 1673959-subscribe-1466705-257.patch

+ 42 - 0
frg-buildfixes/mozilla/9999999-disablemaint-mozilla.patch

@@ -0,0 +1,42 @@
+
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1606757610 18000
+#      Mon Nov 30 12:33:30 2020 -0500
+
+Bug 9999999 -  ignore mainentenace-service option for non-windows.
+diff --git a/toolkit/moz.configure b/toolkit/moz.configure
+--- a/toolkit/moz.configure
++++ b/toolkit/moz.configure
+@@ -1370,22 +1370,25 @@ set_config('MOZ_UNSIGNED_SYSTEM_SCOPE', 
+ 
+ # Maintenance service (Windows only)
+ # ==============================================================
+ 
+ option('--enable-maintenance-service',
+        when=target_is_windows, default=target_is_windows,
+        help='{Enable|Disable} building of maintenance service')
+ 
+-set_define('MOZ_MAINTENANCE_SERVICE',
+-           depends_if('--enable-maintenance-service',
+-                      when=target_is_windows)(lambda _: True))
+-set_config('MOZ_MAINTENANCE_SERVICE',
+-           depends_if('--enable-maintenance-service',
+-                      when=target_is_windows)(lambda _: True))
++@depends("--enable-maintenance-service", when=target_is_windows)
++def maintenance_service_flag(enabled):
++    if enabled:
++        return True
++
++
++set_define("MOZ_MAINTENANCE_SERVICE", maintenance_service_flag)
++set_config("MOZ_MAINTENANCE_SERVICE", maintenance_service_flag)
++
+ 
+ # Bundled fonts on desktop platform
+ # ==============================================================
+ 
+ @depends(target)
+ def bundled_fonts_default(target):
+     return target.os == 'WINNT' or target.kernel == 'Linux'
+ 

+ 1 - 0
frg-buildfixes/mozilla/series

@@ -2508,6 +2508,7 @@ TOP-9999999-fixlangpack-257.patch
 1490575-2-64a1.patch
 1490575-2-64a1.patch
 1490575-3-64a1.patch
 1490575-3-64a1.patch
 1490575-4-64a1.patch
 1490575-4-64a1.patch
+9999999-disablemaint-mozilla.patch
 1520340-1-66a1.patch
 1520340-1-66a1.patch
 1520340-2-66a1.patch
 1520340-2-66a1.patch
 1520340-3-66a1.patch
 1520340-3-66a1.patch

+ 2 - 2
frg-buildfixes/readme.txt

@@ -1,4 +1,4 @@
-Applies clean and works including 1490575-4-64a1.patch
+Applies clean and works including 99999999-disablemaint-mozilla.patch
 
 
 1520340-1-66a1.patch
 1520340-1-66a1.patch
 1520340-2-66a1.patch
 1520340-2-66a1.patch
@@ -15,4 +15,4 @@ Applies clean and works including 1490575-4-64a1.patch
 
 
 might need to be rebased also also need prerequistes.
 might need to be rebased also also need prerequistes.
 
 
-You can remove them for a test. The opthers should appy. As soon as 1522788-66a1.patch is in "mach package" will fail under Windows at last. Didn't test Linux yet.
+You can remove them for a test. The opthers should appy. As soon as 1522788-66a1.patch is in "mach package" will fail under Windows at last. Didn't test Linux yet.