summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-19 18:04:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-21 23:44:08 +0100
commit596cbbf615fc1729e32c812ba23e738d7f850a5a (patch)
treee0a26c03edd22663cd672671369b7caeb2f0f560
parente899b2e25bd3611ab15120ba7e4a723b78a94a05 (diff)
downloadpoky-596cbbf615fc1729e32c812ba23e738d7f850a5a.tar.gz
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. (From OE-Core rev: 777d9744570c2dc119dc5d04985896bbb1da5885) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cargo/cargo.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian.inc1
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb.inc2
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd_git.bb2
-rw-r--r--meta/recipes-extended/iputils/iputils_20210722.bb2
-rw-r--r--meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb2
-rw-r--r--meta/recipes-graphics/shaderc/shaderc_2021.1.bb2
-rw-r--r--meta/recipes-graphics/waffle/waffle_1.6.1.bb2
-rw-r--r--meta/recipes-graphics/xwayland/xwayland_21.1.2.bb2
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb2
-rw-r--r--meta/recipes-sato/webkit/libwpe_1.10.1.bb2
-rw-r--r--meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb2
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"
16CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" 16CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"
17EXCLUDE_FROM_WORLD = "1" 17EXCLUDE_FROM_WORLD = "1"
18 18
19inherit cargo 19inherit cargo pkgconfig
20 20
21do_cargo_setup_snapshot () { 21do_cargo_setup_snapshot () {
22 ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig 22 ${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 @@
1inherit cross-canadian 1inherit cross-canadian
2inherit python3-dir 2inherit python3-dir
3inherit pkgconfig
3 4
4SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)" 5SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)"
5PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" 6PN = "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
2 2
3DEPENDS = "expat-native ncurses-native flex-native bison-native" 3DEPENDS = "expat-native ncurses-native flex-native bison-native"
4 4
5inherit python3native 5inherit python3native pkgconfig
6 6
7# Overrides PACKAGECONFIG variables in gdb-common.inc 7# Overrides PACKAGECONFIG variables in gdb-common.inc
8PACKAGECONFIG ??= "python readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" 8PACKAGECONFIG ??= "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 @@
1require gdb-common.inc 1require gdb-common.inc
2 2
3inherit gettext 3inherit gettext pkgconfig
4 4
5#LDFLAGS:append = " -s" 5#LDFLAGS:append = " -s"
6#export CFLAGS:append=" -L${STAGING_LIBDIR}" 6#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"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14inherit meson gobject-introspection 14inherit meson gobject-introspection pkgconfig
15 15
16EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" 16EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides"
17 17
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,"
37PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," 37PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false,"
38PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" 38PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
39 39
40inherit meson systemd update-alternatives 40inherit meson systemd update-alternatives pkgconfig
41 41
42EXTRA_OEMESON += "--prefix=${root_prefix}/ -DSKIP_TESTS=true" 42EXTRA_OEMESON += "--prefix=${root_prefix}/ -DSKIP_TESTS=true"
43 43
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"
7 7
8LICENSE = "MIT" 8LICENSE = "MIT"
9 9
10inherit meson 10inherit meson pkgconfig
11 11
12SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2" 12SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2"
13PV = "1.26" 13PV = "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 \
14UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" 14UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17inherit cmake python3native 17inherit cmake python3native pkgconfig
18 18
19DEPENDS = "spirv-headers spirv-tools glslang" 19DEPENDS = "spirv-headers spirv-tools glslang"
20 20
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
15 15
16UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html" 16UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html"
17 17
18inherit meson features_check lib_package bash-completion 18inherit meson features_check lib_package bash-completion pkgconfig
19 19
20DEPENDS:append = " python3" 20DEPENDS:append = " python3"
21 21
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
14 14
15UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" 15UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
16 16
17inherit meson features_check 17inherit meson features_check pkgconfig
18REQUIRED_DISTRO_FEATURES = "x11 opengl" 18REQUIRED_DISTRO_FEATURES = "x11 opengl"
19 19
20DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" 20DEPENDS += "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}' \
11 PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ 11 PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \
12" 12"
13 13
14inherit autotools lib_package manpages python3native 14inherit autotools lib_package manpages python3native pkgconfig
15 15
16include lttng-platforms.inc 16include lttng-platforms.inc
17 17
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"
6LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" 6LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
7DEPENDS = "virtual/egl libxkbcommon" 7DEPENDS = "virtual/egl libxkbcommon"
8 8
9inherit cmake features_check 9inherit cmake features_check pkgconfig
10 10
11REQUIRED_DISTRO_FEATURES = "opengl" 11REQUIRED_DISTRO_FEATURES = "opengl"
12 12
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"
8 8
9DEPENDS:append:class-target = " wayland-native" 9DEPENDS:append:class-target = " wayland-native"
10 10
11inherit meson features_check 11inherit meson features_check pkgconfig
12 12
13REQUIRED_DISTRO_FEATURES = "opengl" 13REQUIRED_DISTRO_FEATURES = "opengl"
14 14