The Qt patch for meson needs to be tweaked to apply to the v1.11.2 change [1] in oe-core.
[1] https://git.openembedded.org/openembedded-core/commit/?id=c3bfaa3cd34ac0730c83f38675a25d5ec3f9b6fe Signed-off-by: Ryan Eatmon <[email protected]> --- ...ependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch index ff14dc1c..8ce77c8a 100644 --- a/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch +++ b/meta-arago-extras/dynamic-layers/qt6-layer/recipes-devtools/meson/meson/0001-qt-dependencies-respect-PKG_CONFIG_SYSROOT_DIR-for-c.patch @@ -56,7 +56,7 @@ index c245e5c..a3846ec 100644 return [private_dir, Path(private_dir, f'Qt{module}').as_posix()] -@@ -192,7 +200,10 @@ class QtPkgConfigDependency(_QtBase, PkgConfigDependency, metaclass=abc.ABCMeta) +@@ -195,7 +203,10 @@ class QtPkgConfigDependency(_QtBase, PkgConfigDependency, metaclass=abc.ABCMeta) if self.private_headers: qt_inc_dir = mod.get_variable(pkgconfig='includedir') mod_private_dir = os.path.join(qt_inc_dir, 'Qt' + m) @@ -65,8 +65,8 @@ index c245e5c..a3846ec 100644 + sysroot = os.environ.get('PKG_CONFIG_SYSROOT_DIR', '') + check_dir = os.path.join(sysroot, mod_private_dir.lstrip('/')) if sysroot else mod_private_dir + if not os.path.isdir(check_dir): - # At least some versions of homebrew don't seem to set this - # up correctly. /usr/local/opt/qt/include/Qt + m_name is a - # symlink to /usr/local/opt/qt/include, but the pkg-config + if self.env.machines[self.for_machine].is_darwin(): + # On macOS Qt is conventionally shipped as a framework + # (e.g. Homebrew's qt@6). pkg-config 'includedir' is -- 2.34.1 -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17592): https://lists.yoctoproject.org/g/meta-arago/message/17592 Mute This Topic: https://lists.yoctoproject.org/mt/120384533/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
