Title: [273377] trunk/Tools
- Revision
- 273377
- Author
- commit-qu...@webkit.org
- Date
- 2021-02-24 02:23:21 -0800 (Wed, 24 Feb 2021)
Log Message
[Flatpak SDK] PATH for rustc no longer set correctly
https://bugs.webkit.org/show_bug.cgi?id=222311
Patch by Philippe Normand <pnorm...@igalia.com> on 2021-02-24
Reviewed by Žan Doberšek.
Pass PATH as flatpak --env option, setting is through bwrap no longer works.
* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox):
* flatpak/webkit-bwrap:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (273376 => 273377)
--- trunk/Tools/ChangeLog 2021-02-24 09:26:43 UTC (rev 273376)
+++ trunk/Tools/ChangeLog 2021-02-24 10:23:21 UTC (rev 273377)
@@ -1,3 +1,16 @@
+2021-02-24 Philippe Normand <pnorm...@igalia.com>
+
+ [Flatpak SDK] PATH for rustc no longer set correctly
+ https://bugs.webkit.org/show_bug.cgi?id=222311
+
+ Reviewed by Žan Doberšek.
+
+ Pass PATH as flatpak --env option, setting is through bwrap no longer works.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.run_in_sandbox):
+ * flatpak/webkit-bwrap:
+
2021-02-23 Jonathan Bedard <jbed...@apple.com>
[check-webkit-style] Fix Contributor sorting in Python 3
Modified: trunk/Tools/flatpak/flatpakutils.py (273376 => 273377)
--- trunk/Tools/flatpak/flatpakutils.py 2021-02-24 09:26:43 UTC (rev 273376)
+++ trunk/Tools/flatpak/flatpakutils.py 2021-02-24 10:23:21 UTC (rev 273377)
@@ -698,6 +698,7 @@
sandbox_build_path = os.path.join(self.sandbox_source_root, "WebKitBuild", self.build_type)
sandbox_environment = {
"TEST_RUNNER_INJECTED_BUNDLE_FILENAME": os.path.join(sandbox_build_path, "lib/libTestRunnerInjectedBundle.so"),
+ "PATH": "/usr/bin:/usr/lib/sdk/rust-stable/bin/",
}
if not args:
Modified: trunk/Tools/flatpak/webkit-bwrap (273376 => 273377)
--- trunk/Tools/flatpak/webkit-bwrap 2021-02-24 09:26:43 UTC (rev 273376)
+++ trunk/Tools/flatpak/webkit-bwrap 2021-02-24 10:23:21 UTC (rev 273377)
@@ -108,8 +108,6 @@
if env.startswith("LC_") or env == "LANGUAGE":
bwrap_args.extend(("--unsetenv", env))
- bwrap_args.extend(("--setenv", "PATH", "/usr/bin:/usr/lib/sdk/rust-stable/bin/"))
-
if environ.get("WEBKIT_FLATPAK_LD_PRELOAD"):
os.environ["LD_PRELOAD"] = environ["WEBKIT_FLATPAK_LD_PRELOAD"]
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
