aboutsummaryrefslogtreecommitdiffstats
path: root/meta-boot2qt-distro
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2023-06-12 07:18:45 +0000
committerSamuli Piippo <samuli.piippo@qt.io>2023-06-15 05:19:17 +0000
commit11acf7c46ce4502243a0db5d76755ca33bfa2f0d (patch)
tree6ab5145c3f5ce70073afda8764dec34582493287 /meta-boot2qt-distro
parented1e897bac205179e55555ecb78b77e527a6e500 (diff)
Use gold linker only for Qt modules
Drop ld-is-gold DISTRO_FEATURE and use gold only when linking Qt modules. Gold linker often has problems with system componens, and we are only really interested using it with webengine. Pick-to: mickledore Change-Id: Id399f571fc5a2f9e33f9cb1be77e5d44534230b9 Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Diffstat (limited to 'meta-boot2qt-distro')
-rw-r--r--meta-boot2qt-distro/conf/distro/b2qt.conf6
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend1
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf
index 0c1988a9..a3c51a4b 100644
--- a/meta-boot2qt-distro/conf/distro/b2qt.conf
+++ b/meta-boot2qt-distro/conf/distro/b2qt.conf
@@ -53,9 +53,9 @@ DISTRO_FEATURES_FILTER_NATIVESDK:append = " wayland"
FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
-DISTRO_FEATURES += "gstreamer webengine systemd pam ld-is-gold"
-DISTRO_FEATURES:remove:mipsarch = "webengine ld-is-gold"
-DISTRO_FEATURES:remove:riscv64 = "webengine ld-is-gold"
+DISTRO_FEATURES += "gstreamer webengine systemd pam"
+DISTRO_FEATURES:remove:mipsarch = "webengine"
+DISTRO_FEATURES:remove:riscv64 = "webengine"
INIT_MANAGER = "systemd"
diff --git a/meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend
index 8c9a5396..32f509f5 100644
--- a/meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt6/qtbase_git.bbappend
@@ -32,6 +32,7 @@ PACKAGECONFIG += " \
glib \
sql-sqlite \
tslib \
+ use-gold-linker \
xkbcommon \
"