From 777d9744570c2dc119dc5d04985896bbb1da5885 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 19 Sep 2021 18:04:11 +0100 Subject: recipes: Add missing pkgconfig inherit Various recipes were missing a pkgconfig inherit or pkgconfig-native dependency despite using pkgconfig. Add the inherit to igt-gpu-tools/gdb/libmodulemd/libwpe/xwayland/waffle shaderc/iputils/wpebackend-fdo/lttng-ust/cargo. Signed-off-by: Richard Purdie --- meta/recipes-devtools/cargo/cargo.inc | 2 +- meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 1 + meta/recipes-devtools/gdb/gdb-cross.inc | 2 +- meta/recipes-devtools/gdb/gdb.inc | 2 +- meta/recipes-devtools/libmodulemd/libmodulemd_git.bb | 2 +- meta/recipes-extended/iputils/iputils_20210722.bb | 2 +- meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb | 2 +- meta/recipes-graphics/shaderc/shaderc_2021.1.bb | 2 +- meta/recipes-graphics/waffle/waffle_1.6.1.bb | 2 +- meta/recipes-graphics/xwayland/xwayland_21.1.2.bb | 2 +- meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb | 2 +- meta/recipes-sato/webkit/libwpe_1.10.1.bb | 2 +- meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/meta/recipes-devtools/cargo/cargo.inc b/meta/recipes-devtools/cargo/cargo.inc index 1cf7dd6214..71e1c64f72 100644 --- a/meta/recipes-devtools/cargo/cargo.inc +++ b/meta/recipes-devtools/cargo/cargo.inc @@ -16,7 +16,7 @@ S = "${RUSTSRC}/src/tools/cargo" CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" EXCLUDE_FROM_WORLD = "1" -inherit cargo +inherit cargo pkgconfig do_cargo_setup_snapshot () { ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 670534fb5f..dfacba29a0 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -1,5 +1,6 @@ inherit cross-canadian inherit python3-dir +inherit pkgconfig SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)" PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc index 6ba3eae6fc..4e50cd5ab0 100644 --- a/meta/recipes-devtools/gdb/gdb-cross.inc +++ b/meta/recipes-devtools/gdb/gdb-cross.inc @@ -2,7 +2,7 @@ require gdb-common.inc DEPENDS = "expat-native ncurses-native flex-native bison-native" -inherit python3native +inherit python3native pkgconfig # Overrides PACKAGECONFIG variables in gdb-common.inc PACKAGECONFIG ??= "python readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 2b0ae1655f..2c95ed3ca0 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc @@ -1,6 +1,6 @@ require gdb-common.inc -inherit gettext +inherit gettext pkgconfig #LDFLAGS:append = " -s" #export CFLAGS:append=" -L${STAGING_LIBDIR}" diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb index 963e881d6c..ee8ce4d6a6 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -11,7 +11,7 @@ SRCREV = "1a032da198333ee77bdbe4be65e60eb4115ea73f" S = "${WORKDIR}/git" -inherit meson gobject-introspection +inherit meson gobject-introspection pkgconfig EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" diff --git a/meta/recipes-extended/iputils/iputils_20210722.bb b/meta/recipes-extended/iputils/iputils_20210722.bb index a9821e556f..e1940b77b5 100644 --- a/meta/recipes-extended/iputils/iputils_20210722.bb +++ b/meta/recipes-extended/iputils/iputils_20210722.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[tftpd] = "-DBUILD_TFTPD=true, -DBUILD_TFTPD=false," PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" -inherit meson systemd update-alternatives +inherit meson systemd update-alternatives pkgconfig EXTRA_OEMESON += "--prefix=${root_prefix}/ -DSKIP_TESTS=true" diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb index 79fab7a28a..1a00eca7d3 100644 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=67bfee4df38fa6ecbe3a675c552d4c08" LICENSE = "MIT" -inherit meson +inherit meson pkgconfig SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2" PV = "1.26" diff --git a/meta/recipes-graphics/shaderc/shaderc_2021.1.bb b/meta/recipes-graphics/shaderc/shaderc_2021.1.bb index e15b5794ee..ad3f62ce17 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2021.1.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2021.1.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ UPSTREAM_CHECK_GITTAGREGEX = "^v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit cmake python3native +inherit cmake python3native pkgconfig DEPENDS = "spirv-headers spirv-tools glslang" diff --git a/meta/recipes-graphics/waffle/waffle_1.6.1.bb b/meta/recipes-graphics/waffle/waffle_1.6.1.bb index fa5efc12c4..395494018a 100644 --- a/meta/recipes-graphics/waffle/waffle_1.6.1.bb +++ b/meta/recipes-graphics/waffle/waffle_1.6.1.bb @@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "31565649ff0e2d8dff1b8f7f2264ab7a78452063c7e04adfc4ce03e64b UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html" -inherit meson features_check lib_package bash-completion +inherit meson features_check lib_package bash-completion pkgconfig DEPENDS:append = " python3" diff --git a/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb b/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb index 3df6fd1ff9..6aba65935b 100644 --- a/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb +++ b/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "b81cbdd5ad60b8b7ad8c3ecc7ec2a28c9bf021448670735cebb501f08b UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" -inherit meson features_check +inherit meson features_check pkgconfig REQUIRED_DISTRO_FEATURES = "x11 opengl" DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb index 2074b8c318..3b0e205ab8 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb @@ -11,7 +11,7 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ " -inherit autotools lib_package manpages python3native +inherit autotools lib_package manpages python3native pkgconfig include lttng-platforms.inc diff --git a/meta/recipes-sato/webkit/libwpe_1.10.1.bb b/meta/recipes-sato/webkit/libwpe_1.10.1.bb index 4e77481bc8..68214ffbad 100644 --- a/meta/recipes-sato/webkit/libwpe_1.10.1.bb +++ b/meta/recipes-sato/webkit/libwpe_1.10.1.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" DEPENDS = "virtual/egl libxkbcommon" -inherit cmake features_check +inherit cmake features_check pkgconfig REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb index 29ffb9091f..f2d640f07a 100644 --- a/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy" DEPENDS:append:class-target = " wayland-native" -inherit meson features_check +inherit meson features_check pkgconfig REQUIRED_DISTRO_FEATURES = "opengl" -- cgit 1.2.3-korg