Title: [264063] trunk/Tools
- Revision
- 264063
- Author
- [email protected]
- Date
- 2020-07-08 01:20:05 -0700 (Wed, 08 Jul 2020)
Log Message
[Flatpak SDK] Initial installation with IceCC enabled fails
https://bugs.webkit.org/show_bug.cgi?id=213833
Patch by Philippe Normand <[email protected]> on 2020-07-08
Reviewed by Adrian Perez de Castro.
Avoid attempting to use the IceCC environment during the toolchain
archive update. The initial SDK installation triggers this when
IceCC is enabled on the command-line or via CCACHE_PREFIX, after
resetting the internal toolchain mapping. So the solution is to
opt-out of this runtime configuration setup, which is useless
anyway when the toolchain archive is being generated.
* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox):
(WebkitFlatpak.pack_toolchain):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (264062 => 264063)
--- trunk/Tools/ChangeLog 2020-07-08 08:03:29 UTC (rev 264062)
+++ trunk/Tools/ChangeLog 2020-07-08 08:20:05 UTC (rev 264063)
@@ -1,3 +1,21 @@
+2020-07-08 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Initial installation with IceCC enabled fails
+ https://bugs.webkit.org/show_bug.cgi?id=213833
+
+ Reviewed by Adrian Perez de Castro.
+
+ Avoid attempting to use the IceCC environment during the toolchain
+ archive update. The initial SDK installation triggers this when
+ IceCC is enabled on the command-line or via CCACHE_PREFIX, after
+ resetting the internal toolchain mapping. So the solution is to
+ opt-out of this runtime configuration setup, which is useless
+ anyway when the toolchain archive is being generated.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.run_in_sandbox):
+ (WebkitFlatpak.pack_toolchain):
+
2020-07-07 Sam Weinig <[email protected]>
Enabled testing of date/time input types for WebKit2 macOS
Modified: trunk/Tools/flatpak/flatpakutils.py (264062 => 264063)
--- trunk/Tools/flatpak/flatpakutils.py 2020-07-08 08:03:29 UTC (rev 264062)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-07-08 08:20:05 UTC (rev 264063)
@@ -652,6 +652,7 @@
extra_env_vars = kwargs.pop("env", {})
stdout = kwargs.pop("stdout", sys.stdout)
extra_flatpak_args = kwargs.pop("extra_flatpak_args", [])
+ skip_icc = kwargs.pop("skip_icc", False)
if not isinstance(args, list):
args = list(args)
@@ -780,7 +781,7 @@
_log.debug("Overriding sccache server port to %s" % override_sccache_server_port)
sandbox_environment["SCCACHE_SERVER_PORT"] = override_sccache_server_port
- if self.use_icecream and not self.regenerate_toolchains:
+ if self.use_icecream and not skip_icc:
_log.debug('Enabling the icecream compiler')
if share_network_option not in flatpak_command:
flatpak_command.append(share_network_option)
@@ -900,7 +901,7 @@
with tempfile.NamedTemporaryFile() as tmpfile:
command = ['icecc', '--build-native']
command.extend(["/usr/bin/%s" % compiler for compiler in compilers])
- self.run_in_sandbox(*command, stdout=tmpfile, cwd=self.source_root)
+ self.run_in_sandbox(*command, stdout=tmpfile, cwd=self.source_root, skip_icc=True)
tmpfile.flush()
tmpfile.seek(0)
icc_version_filename, = re.findall(br'.*creating (.*)', tmpfile.read())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
