mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 00:20:38 -09:00
1956e4e434
As of Flutter 3.27.4, the flutter-engine github repository is archived, and the flutter-engine source code now resides at https://github.com/flutter/flutter/. Because of the above, the following changes must occure: - Paths are now prefixed with engine/src. - The "name" field in the dot-gclient file is now "./", and the gen-tarball script: - Makes the dl-tmp/src dir - Copies the dot-gclient file to the dl-tmp/src dir - Runs gclient.py inside of the dl-tmp/src dir Without these changes, gclient creates two directores: dl-tmp/src/flutter and dl-tmp/src/engine, and cloning fails with the following error: ``` python3: can't open file 'dl-tmp/src/engine/src/flutter/tools/pub_get_offline.py': [Errno 2] No such file or directory ``` because the file resides at src/flutter/engine/src/flutter/tools. Changing the name from src/flutter to ./ and running gclient.py directly in the src directory creates a proper directory structure suitable for compiling. Of course, this also means there is a new pushd in the gen_tarball method to move to ${SCRATCH_DIR} to ensure the tarball is generated outside of the source directory. Tested with run-tests tests.package.test_flutter.TestFlutter.test_run. The license file has changed, but it's still BSD-3-Clause. Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 49a14e693124dc34f2cccbfb755d01a1198aa6bf Mon Sep 17 00:00:00 2001
|
|
From: Joel Winarske <joel.winarsk@gmail.com>
|
|
Date: Wed, 19 Jul 2023 15:24:22 -0700
|
|
Subject: [PATCH] disable pre-canned sysroot
|
|
|
|
Override should be enabled if a custom sysroot using --target-sysroot is
|
|
specified. If --target-sysroot is not set, then it should default to the
|
|
pre-canned sysroot.
|
|
|
|
Upstream: https://github.com/flutter/flutter/issues/123073
|
|
Signed-off-by: Joel Winarske <joel.winarsk@gmail.com>
|
|
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
|
|
---
|
|
engine/src/build/config/sysroot.gni | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/engine/src/build/config/sysroot.gni b/engine/src/build/config/sysroot.gni
|
|
index 7987e519d..1de694263 100644
|
|
--- a/engine/src/build/config/sysroot.gni
|
|
+++ b/engine/src/build/config/sysroot.gni
|
|
@@ -12,7 +12,7 @@ declare_args() {
|
|
|
|
# Whether to use the default sysroot when building for Linux, if an explicit
|
|
# sysroot isn't set.
|
|
- use_default_linux_sysroot = true
|
|
+ use_default_linux_sysroot = false
|
|
}
|
|
|
|
if (current_toolchain == default_toolchain && target_sysroot != "") {
|
|
--
|
|
2.41.0
|
|
|