From d055bf53d4eb0175a8d627a846ae15c419efa89e Mon Sep 17 00:00:00 2001
From: Philippe Coval <philippe.coval.ext@huawei.com>
Date: Sat, 2 Apr 2022 11:32:54 +0200
Subject: [PATCH] conf: Relocate TCLIB overide to distro
distro: Prevent to build for musl flavour
This can be verified using:
bitbake -e | grep TCLIB
Relate-to: https://github.com/flutter/flutter/issues/46016
Signed-off-by: Philippe Coval <philippe.coval.ext@huawei.com>
---
conf/distro/oniro-linux-blueprint-flutter.conf | 6 ++++++
conf/layer.conf | 4 ----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/conf/distro/oniro-linux-blueprint-flutter.conf b/conf/distro/oniro-linux-blueprint-flutter.conf
index cd68c85..f2b753e 100644
--- a/conf/distro/oniro-linux-blueprint-flutter.conf
+++ b/conf/distro/oniro-linux-blueprint-flutter.conf
@@ -16,3 +16,9 @@ PACKAGECONFIG:remove = "gstreamer"
# TODO: Check if image is enough
IMAGE_FEATURES:remove = "read-only-rootfs"
ROOT_FSTYPE = "ext4"
+
+# Relate-to: https://github.com/flutter/flutter/issues/46016
+COMPATIBLE_HOST:libc-musl = 'null'
+# Relate-to: https://github.com/flutter/flutter/issues/52102
+TCLIBC = "glibc"
+
diff --git a/conf/layer.conf b/conf/layer.conf
index d4fd466..26c6151 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -28,10 +28,6 @@ LAYERSERIES_COMPAT_meta-oniro-blueprint-flutter = "dunfell honister kirkstone"
# FLUTTER_CHANNEL ?= "stable"
FLUTTER_RUNTIME ?= "release"
-# TODO: move to flutter
-# Relate-to: https://github.com/flutter/flutter/issues/52102
-TCLIBC = "glibc"
-
PACKAGECONFIG:pn-flutter-engine-release = "disable-desktop-embeddings embedder-for-target fontconfig release"
PACKAGECONFIG:pn-flutter-engine-debug = "disable-desktop-embeddings embedder-for-target fontconfig debug"
PACKAGECONFIG:pn-flutter-engine-profile = "disable-desktop-embeddings embedder-for-target fontconfig profile"
--
GitLab