diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2024-03-21 08:08:11 +0000 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2024-04-17 09:19:32 +0300 |
| commit | 8b0e8552a1c1ffb79e7961641669757ceb3c3a85 (patch) | |
| tree | a10ac132dfd42e2f7e212aeb51b0d16d37cc9261 | |
| parent | 5c3d2178658383e0d1d9bba46181eb79148bcdee (diff) | |
Add meta-clang to build
Clang will be used for Qt for Python, but it also provides needed support
for qttools to build qdoc. We don't need it for target builds, remove the
PACKAGECONFIG set in meta-clang.
Change-Id: I9598402d7616e5190a8d43a97b1faa8c77c67d1d
Reviewed-by: Alex Bu <alex.bu@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 689404facef4b622b74f2dd90917f808f56f8acd)
| -rw-r--r-- | meta-boot2qt-distro/conf/bblayers.conf.fsl.sample | 1 | ||||
| -rw-r--r-- | meta-boot2qt-distro/conf/bblayers.conf.intel.sample | 1 | ||||
| -rw-r--r-- | meta-boot2qt-distro/conf/bblayers.conf.jetson.sample | 1 | ||||
| -rw-r--r-- | meta-boot2qt-distro/conf/bblayers.conf.rpi.sample | 1 | ||||
| -rw-r--r-- | meta-boot2qt-distro/conf/bblayers.conf.sample | 1 | ||||
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/qt6/qttools_%.bbappend | 1 | ||||
| -rw-r--r-- | scripts/manifest.xml | 9 |
7 files changed, 15 insertions, 0 deletions
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample index fadd0cab..3b9bbdaa 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample @@ -45,6 +45,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ + ${BSPDIR}/sources/meta-clang \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \ ${BSPDIR}/sources/meta-mingw \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample index 4d81cc33..1af4fcb5 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample @@ -44,6 +44,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ + ${BSPDIR}/sources/meta-clang \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \ ${BSPDIR}/sources/meta-mingw \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample index 9f097770..bcca9331 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample @@ -45,6 +45,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ + ${BSPDIR}/sources/meta-clang \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \ ${BSPDIR}/sources/meta-mingw \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample index 07731e6b..7e687ffd 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample @@ -44,6 +44,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ + ${BSPDIR}/sources/meta-clang \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \ ${BSPDIR}/sources/meta-mingw \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.sample b/meta-boot2qt-distro/conf/bblayers.conf.sample index 6ceb29dd..cc361df9 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.sample @@ -43,6 +43,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ + ${BSPDIR}/sources/meta-clang \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \ ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \ ${BSPDIR}/sources/meta-mingw \ diff --git a/meta-boot2qt-distro/recipes-qt/qt6/qttools_%.bbappend b/meta-boot2qt-distro/recipes-qt/qt6/qttools_%.bbappend new file mode 100644 index 00000000..0bca4c77 --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/qt6/qttools_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:remove:class-target = "clang" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index d717bff6..a7531a10 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -23,6 +23,15 @@ upstream="kirkstone" path="sources/meta-openembedded"/> + <!-- Clang --> + <remote name="kraj" + fetch="https://github.com/kraj"/> + <project name="meta-clang" + remote="kraj" + revision="312ff1c39b1bf5d35c0321e873417eb013cea477" + upstream="kirkstone" + path="sources/meta-clang"/> + <!-- Qt --> <remote name="qt" fetch="git://code.qt.io/yocto" |