Title: [262116] trunk/Tools
- Revision
- 262116
- Author
- [email protected]
- Date
- 2020-05-25 01:31:38 -0700 (Mon, 25 May 2020)
Log Message
[Flatpak SDK] Fixup icecc support
https://bugs.webkit.org/show_bug.cgi?id=212301
Patch by Philippe Normand <[email protected]> on 2020-05-25
Reviewed by Žan Doberšek.
* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox): Allow homedir access from the
sandbox, this is needed because the icecc toolchains paths refer
to the host environment, not the sandbox.
(WebkitFlatpak.pack_toolchain): Fix byte-string formatting issue, happening in Python3.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (262115 => 262116)
--- trunk/Tools/ChangeLog 2020-05-25 08:16:57 UTC (rev 262115)
+++ trunk/Tools/ChangeLog 2020-05-25 08:31:38 UTC (rev 262116)
@@ -1,5 +1,18 @@
2020-05-25 Philippe Normand <[email protected]>
+ [Flatpak SDK] Fixup icecc support
+ https://bugs.webkit.org/show_bug.cgi?id=212301
+
+ Reviewed by Žan Doberšek.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.run_in_sandbox): Allow homedir access from the
+ sandbox, this is needed because the icecc toolchains paths refer
+ to the host environment, not the sandbox.
+ (WebkitFlatpak.pack_toolchain): Fix byte-string formatting issue, happening in Python3.
+
+2020-05-25 Philippe Normand <[email protected]>
+
[GTK4] SDK contains too old GTK4
https://bugs.webkit.org/show_bug.cgi?id=212334
Modified: trunk/Tools/flatpak/flatpakutils.py (262115 => 262116)
--- trunk/Tools/flatpak/flatpakutils.py 2020-05-25 08:16:57 UTC (rev 262115)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-05-25 08:31:38 UTC (rev 262116)
@@ -762,6 +762,7 @@
_log.debug('Enabling the icecream compiler')
if share_network_option not in flatpak_command:
flatpak_command.append(share_network_option)
+ flatpak_command.append("--filesystem=home")
n_cores = multiprocessing.cpu_count() * 3
_log.debug('Following icecream recommendation for the number of cores to use: %d' % n_cores)
@@ -873,7 +874,7 @@
toolchains_directory = os.path.join(self.build_root, "Toolchains")
if not os.path.isdir(toolchains_directory):
os.makedirs(toolchains_directory)
- archive_filename = os.path.join(toolchains_directory, "webkit-sdk-%s-%s" % (compilers[0], icc_version_filename))
+ archive_filename = os.path.join(toolchains_directory, "webkit-sdk-{name}-{filename}".format(name=compilers[0], filename=icc_version_filename.decode()))
os.rename(icc_version_filename, archive_filename)
self.icc_version[compilers[0]] = archive_filename
Console.message("Created %s self-contained toolchain archive", archive_filename)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
