From 288288033137c19b72948a91d74b82b66c788fe3 Mon Sep 17 00:00:00 2001
From: Michel Zink <michelzink@gmx.net>
Date: Tue, 18 Apr 2023 17:08:23 +0200
Subject: [PATCH] Change cmake options to support multilib feature

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.
---
 classes/cmake_kf5.bbclass   | 2 +-
 classes/kauth.bbclass       | 2 +-
 classes/kcmutils.bbclass    | 2 +-
 classes/kconfig.bbclass     | 2 +-
 classes/kcoreaddons.bbclass | 2 +-
 classes/kdoctools.bbclass   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
index 5bf62d4..aa9e5ff 100644
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -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 \
 "
 
diff --git a/classes/kauth.bbclass b/classes/kauth.bbclass
index 543f0c3..1c5589f 100644
--- a/classes/kauth.bbclass
+++ b/classes/kauth.bbclass
@@ -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"
diff --git a/classes/kcmutils.bbclass b/classes/kcmutils.bbclass
index d7c5af4..5f911b9 100644
--- a/classes/kcmutils.bbclass
+++ b/classes/kcmutils.bbclass
@@ -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"
diff --git a/classes/kconfig.bbclass b/classes/kconfig.bbclass
index 26cb5ac..f136e31 100644
--- a/classes/kconfig.bbclass
+++ b/classes/kconfig.bbclass
@@ -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"
diff --git a/classes/kcoreaddons.bbclass b/classes/kcoreaddons.bbclass
index f3efca1..b0aa5d7 100644
--- a/classes/kcoreaddons.bbclass
+++ b/classes/kcoreaddons.bbclass
@@ -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} \
 "
diff --git a/classes/kdoctools.bbclass b/classes/kdoctools.bbclass
index 5d1a920..7e66946 100644
--- a/classes/kdoctools.bbclass
+++ b/classes/kdoctools.bbclass
@@ -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"