Changeset 259860 in webkit

Timestamp:

Apr 10, 2020, 3:58:25 AM (6 years ago)

Author:

Philippe Normand

Message:

[Flatpak SDK] Improved sccache support
​https://bugs.webkit.org/show_bug.cgi?id=210027

Reviewed by Žan Doberšek.

.:

• Source/cmake/WebKitCCache.cmake: Check for sccache if one of its

environment variables has been set as well, otherwise the local
disk cache would be used, if WEBKIT_USE_SCCACHE is set to 1.

Tools:

Whitelist SCCACHE environment variables into the sandbox and allow
network access when one of those has been set.

• flatpak/flatpakutils.py:

(WebkitFlatpak.run_in_sandbox):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitCCache.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/flatpak/flatpakutils.py (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2020-04-10  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Improved sccache support
+        https://bugs.webkit.org/show_bug.cgi?id=210027
+
+        Reviewed by Žan Doberšek.
+
+        * Source/cmake/WebKitCCache.cmake: Check for sccache if one of its
+        environment variables has been set as well, otherwise the local
+        disk cache would be used, if WEBKIT_USE_SCCACHE is set to 1.
+
 2020-04-08  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/cmake/WebKitCCache.cmake

@@ -27 +27 @@
 endif ()
 
-if ("$ENV{WEBKIT_USE_SCCACHE}" STREQUAL "YES")
+if (("$ENV{WEBKIT_USE_SCCACHE}" STREQUAL "1") OR DEFINED ENV{SCCACHE_REDIS} OR DEFINED ENV{SCCACHE_BUCKET}
+    OR DEFINED ENV{SCCACHE_MEMCACHED} OR DEFINED ENV{SCCACHE_GCS_BUCKET} OR DEFINED ENV{SCCACHE_AZURE_CONNECTION_STRING})
     find_program(SCCACHE_FOUND sccache)
     if (SCCACHE_FOUND)
+        message(STATUS "Enabling sccache as prefix for compiler.")
         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${SCCACHE_FOUND})
     endif ()

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-10  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Improved sccache support
+        https://bugs.webkit.org/show_bug.cgi?id=210027
+
+        Reviewed by Žan Doberšek.
+
+        Whitelist SCCACHE environment variables into the sandbox and allow
+        network access when one of those has been set.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.run_in_sandbox):
+
 2020-04-10  Commit Queue  <commit-queue@webkit.org>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -625 +625 @@
             "ICECC",
             "JSC",
+            "SCCACHE",
             "WEBKIT",
             "WEBKIT2",
@@ -663 +664 @@
                 forwarded[envvar] = value
 
+        share_network_option = "--share=network"
+        remote_sccache_configs = set(["SCCACHE_REDIS", "SCCACHE_BUCKET", "SCCACHE_MEMCACHED",
+                                      "SCCACHE_GCS_BUCKET", "SCCACHE_AZURE_CONNECTION_STRING",
+                                      "WEBKIT_USE_SCCACHE"])
+        if remote_sccache_configs.intersection(set(os.environ.keys())):
+            _log.debug("Enabling network access for the remote sccache")
+            flatpak_command.append(share_network_option)
+
         if self.use_icecream:
             _log.debug('Enabling the icecream compiler')
-            flatpak_command.extend(["--share=network",
-                                    "--bind-mount=/var/run/icecc=/var/run/icecc"])
+            if share_network_option not in flatpak_command:
+                flatpak_command.append(share_network_option)
+            flatpak_command.append("--bind-mount=/var/run/icecc=/var/run/icecc")
 
             n_cores = multiprocessing.cpu_count() * 3