CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: add PACKAGECONFIGs for different linkers

Browse Source 
Add PACKAGECONFIG options for gold and bfd linkers so that they can
be easily changed independently of the ld-is-gold DISTRO_FEATURE.

For CI builds, drop ld-is-gold feature and instead enable gold only
for Qt modules.

Pick-to: 6.5
Change-Id: I63e3835f15c732f57740b6718245e4f45ddb6c8c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2023-05-25 06:13:00 +00:00
parent 6ad68945b5
commit 8f67afff3f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
coin/test-configs.inc
View File

@ -1,6 +1,4 @@
PREFERRED_PROVIDER_udev = "systemd"
# use gold
DISTRO_FEATURES:append = " ld-is-gold"
# use systemd
DISTRO_FEATURES:append = " systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
@ -45,6 +43,7 @@ PACKAGECONFIG:append:pn-qtbase = "\
tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
use-gold-linker \
"
# imageformats mng FIXME

4
recipes-qt/qt6/qtbase_git.bb
View File

@ -71,6 +71,7 @@ PACKAGECONFIG_DEFAULT ?= "\
icu \
jpeg \
libinput \
${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'use-gold-linker', '', d)} \
openssl \
png \
udev \
@ -96,6 +97,8 @@ PACKAGECONFIG[ltcg] = "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON,-DCMAKE_INTERPROC
PACKAGECONFIG[optimize-size] = "-DFEATURE_optimize_size=ON,-DFEATURE_optimize_size=OFF"
PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-DFEATURE_developer_build=OFF"
PACKAGECONFIG[use-gold-linker] = "-DFEATURE_use_gold_linker=ON"
PACKAGECONFIG[use-bfd-linker] = "-DFEATURE_use_bfd_linker=ON"
PACKAGECONFIG[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups"
PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus"
@ -157,7 +160,6 @@ EXTRA_OECMAKE += "\
EXTRA_OECMAKE:append:class-target = "\
-DFEATURE_rpath=OFF \
-DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-DFEATURE_use_gold_linker=ON', '-DFEATURE_use_bfd_linker=ON', d)} \
"
EXTRA_OECMAKE:append:mingw32 = "\