diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-04-28 10:37:24 +0000 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2023-08-18 12:34:25 +0000 |
| commit | 252c43870835a2ebd03ffba947c026181aebfee4 (patch) | |
| tree | 657ae18492c9783f497d7263338f589a58f7d654 | |
| parent | 579a5e5440ac46abc8ab521d471658e951bc61b5 (diff) | |
qtshadertools: add runtime dependency to spirv-tools
Add runtime dependency to spirv-tools as the qsb utility can use
spirv-opt at runtime. Cannot include it for mingw32 toolchain
as compilation fails.
To support dunfell, add BBCLASSEXTEND append to the spirv-tools.
Fixes: QTBUG-113210
Change-Id: Icce264b1f2bff5f56cf2b40a0420c5001493e236
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 69a8018ec11d46f709b4d7e539f0334ef19e0927)
| -rw-r--r-- | conf/layer.conf | 5 | ||||
| -rw-r--r-- | dynamic-layers/openembedded-layer/recipes-graphics/spir/spirv-tools_%.bbappend | 1 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtshadertools_git.bb | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index c3a9b44..636dc27 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -14,6 +14,11 @@ BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" +# bbappends for optional layers +BBFILES_DYNAMIC += " \ + openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \ +" + BBFILE_COLLECTIONS += "qt6-layer" BBFILE_PATTERN_qt6-layer := "^${LAYERDIR}/" diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/spir/spirv-tools_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/spir/spirv-tools_%.bbappend new file mode 100644 index 0000000..608377e --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-graphics/spir/spirv-tools_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb index 6f503f3..7b4e93c 100644 --- a/recipes-qt/qt6/qtshadertools_git.bb +++ b/recipes-qt/qt6/qtshadertools_git.bb @@ -11,5 +11,8 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtshadertools-native" +RDEPENDS:${PN}-tools = "spirv-tools" +RDEPENDS:${PN}-tools:remove:mingw32 = "spirv-tools" + BBCLASSEXTEND = "native nativesdk" |