recipes: inherit pkgconfig

Instead of depending directly on pkgconfig-native, inherit the pkgconfig
class.  At the moment this just adds a layer of indirection to the right
provider of pkgconfig, but there are patches in flight to move exports
into the class to isolate the variables.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>

6 files changed, 14 insertions, 12 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2550.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2550.0.0.0.bb
index 3804338e..d601fb31 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2550.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2550.0.0.0.bb
@@ -10,9 +10,9 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 COMPATIBLE_HOST:libc-musl = "null"
 
-inherit cmake systemd features_check python3native
+inherit cmake systemd features_check python3native pkgconfig
 
-DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native python3-packaging-native"
+DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native python3-packaging-native"
 
 # Enable either connman or networkmanager or none but not both.
 PACKAGECONFIG ??= "connman"
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver_1.28.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver_1.28.0.bb
index 1be67e01..1bf7c46a 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver_1.28.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver_1.28.0.bb
@@ -21,7 +21,7 @@ SRCREV_lzvext = "61e4aeb00afd2a5b6955986269eed3a713c7b562"
 SRCREV_googletest = "b514bdc898e2951020cbdca1304b75f5950d1f59"
 SRCREV_FORMAT = "linux-npu-driver_npu-compiler-elf_yaml-cpp_lzvext_googletest"
 
-inherit cmake
+inherit cmake pkgconfig
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = 'null'
@@ -34,7 +34,7 @@ EXTRA_OECMAKE += " -DCMAKE_INSTALL_FIRMWARE_DIR=${nonarch_base_libdir}"
 EXTRA_OECMAKE += " -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
 EXTRA_OECMAKE += " -DCMAKE_CXX_FLAGS='-I${STAGING_INCDIR}/level_zero'"
 
-DEPENDS = "level-zero dpkg-native pkgconfig-native level-zero-native"
+DEPENDS = "level-zero dpkg-native level-zero-native"
 
 PACKAGES =+ "${PN}-firmware ${PN}-tests"
 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0538.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0538.bb
index aeefe4a4..4ec337f1 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0538.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0538.bb
@@ -27,9 +27,9 @@ SRCREV_ipmctl = "a71f2fb1c90dd07f9862b71c789881132193e8f9"
 SRCREV_edk2 = "46548b1adac82211d8d11da12dd914f41e7aa775"
 SRCREV_FORMAT = "ipmctl_edk2"
 
-inherit cmake dos2unix
+inherit cmake dos2unix pkgconfig
 
-DEPENDS = "ndctl pkgconfig-native"
+DEPENDS = "ndctl"
 
 EXTRA_OECMAKE = "-DRELEASE=ON \
                  -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
diff --git a/recipes-multimedia/vpl/libvpl-tools_1.5.0.bb b/recipes-multimedia/vpl/libvpl-tools_1.5.0.bb
index 662d3add..33db121e 100644
--- a/recipes-multimedia/vpl/libvpl-tools_1.5.0.bb
+++ b/recipes-multimedia/vpl/libvpl-tools_1.5.0.bb
@@ -13,8 +13,9 @@ SRC_URI = "git://github.com/intel/libvpl-tools.git;protocol=https;branch=main \
 
 SRCREV = "ad9deecaf0ee76f689373b55fe620c843e3c8a4d"
 
-inherit cmake
-DEPENDS += "libva libvpl pkgconfig-native"
+inherit cmake pkgconfig
+
+DEPENDS += "libva libvpl"
 
 PACKAGECONFIG ??= "tools"
 PACKAGECONFIG[tools] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native wayland-protocols"
diff --git a/recipes-multimedia/vpl/libvpl_2.16.0.bb b/recipes-multimedia/vpl/libvpl_2.16.0.bb
index 107abef5..19fe8d14 100644
--- a/recipes-multimedia/vpl/libvpl_2.16.0.bb
+++ b/recipes-multimedia/vpl/libvpl_2.16.0.bb
@@ -13,8 +13,9 @@ SRC_URI = "git://github.com/intel/libvpl.git;protocol=https;branch=main \
             "
 SRCREV = "778a66d6c6537f08eabb91955dbbf1bce3812894"
 
-inherit cmake
-DEPENDS += "libva pkgconfig-native"
+inherit cmake pkgconfig
+
+DEPENDS += "libva"
 
 PACKAGECONFIG ??= "tools"
 PACKAGECONFIG[tools] = "-DBUILD_TOOLS=ON, -DBUILD_TOOLS=OFF, wayland wayland-native wayland-protocols"
diff --git a/recipes-multimedia/vpl/vpl-gpu-rt_26.1.0.bb b/recipes-multimedia/vpl/vpl-gpu-rt_26.1.0.bb
index 74fd3ae2..abc62d14 100644
--- a/recipes-multimedia/vpl/vpl-gpu-rt_26.1.0.bb
+++ b/recipes-multimedia/vpl/vpl-gpu-rt_26.1.0.bb
@@ -14,7 +14,7 @@ PE = "1"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:x86-x32 = "null"
 
-DEPENDS += "libdrm libva intel-media-driver libvpl pkgconfig-native"
+DEPENDS += "libdrm libva intel-media-driver libvpl"
 RDEPENDS:${PN} += "intel-media-driver"
 
 SRC_URI = "git://github.com/intel/vpl-gpu-rt.git;protocol=https;nobranch=1;lfs=0 \
@@ -26,7 +26,7 @@ FILES:${PN} += " \
                 ${libdir}/libmfx-gen/enctools.so \
                "
 
-inherit cmake features_check
+inherit cmake features_check pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "opengl"