zepto-mirrors/meta-kf5
1
0
Fork 0
mirror of https://invent.kde.org/packaging/yocto-meta-kf5.git synced 2026-01-29 21:08:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change cmake options to support multilib feature

Browse Source 
Platforms which uses the multilib feature can not use this layer because
the libdir variable will be change by the multilib bbclass.
Using STAGING_LIBDIR_NATIVE instead is more reliable.
This commit is contained in:
Michel Zink
2023-04-18 17:08:23 +02:00
committed by Andreas Cord-Landwehr
parent e292e257b8
commit 2882880331
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/cmake_kf5.bbclass
View File

@@ -16,7 +16,7 @@ EXTRA_OECMAKE:append:class-native = " \
EXTRA_OECMAKE:append:class-target = " \
-DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \
-DBUILD_TESTING=OFF \
-DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake \
-DKF5_HOST_TOOLING=${STAGING_LIBDIR_NATIVE}/cmake \
-DBUILD_DESIGNERPLUGIN=OFF \
"

2
classes/kauth.bbclass
View File

@@ -11,4 +11,4 @@ DEPENDS:append:class-target = " \
polkit-qt-1 \
"
EXTRA_OECMAKE:append = " -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake"
EXTRA_OECMAKE:append = " -DKF5_HOST_TOOLING=${STAGING_LIBDIR_NATIVE}/cmake"

2
classes/kcmutils.bbclass
View File

@@ -9,4 +9,4 @@ DEPENDS:append = " \
kcmutils-native \
"
EXTRA_OECMAKE:append = " -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake"
EXTRA_OECMAKE:append = " -DKF5_HOST_TOOLING=${STAGING_LIBDIR_NATIVE}/cmake"

2
classes/kconfig.bbclass
View File

@@ -9,4 +9,4 @@ DEPENDS:append = " \
kconfig-native \
"
EXTRA_OECMAKE:append = " -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake"
EXTRA_OECMAKE:append = " -DKF5_HOST_TOOLING=${STAGING_LIBDIR_NATIVE}/cmake"

2
classes/kcoreaddons.bbclass
View File

@@ -12,6 +12,6 @@ DEPENDS:append = " \
# for crosscompilation desktoptojson uses CMAKE_SYSROOT as root path for locating files
EXTRA_OECMAKE:append = " \
-DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake \
-DKF5_HOST_TOOLING=${STAGING_LIBDIR_NATIVE}/cmake \
-DCMAKE_SYSROOT=${RECIPE_SYSROOT} \
"

2
classes/kdoctools.bbclass
View File

@@ -16,4 +16,4 @@ DEPENDS:append = " \
karchive-native \
"
EXTRA_OECMAKE:append = " -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake"
EXTRA_OECMAKE:append = " -DKF5_HOST_TOOLING=${STAGING_LIBDIR_NATIVE}/cmake"