pkgconfig: inherit the pkgconfig class

Building target pkgconfig needs pkgconfig-native because pkgconfig uses
pkgconfig to find libglib.  Inherit the pkgconfig class so that the
pkgconfig recipe does not need to know the details of how pkgconfig is
integrated.

Native builds use an internal copy of glib to avoid the circular
dependency, and the self-dependency on pkgconfig-native is automatically
pruned.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index 19b9b6bc9de75df6ec50e3f58052649ecf49bfa0..d4350be212ba9eaa1098fe8986ecd1456fc4587a 100644 (file)
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -19,7 +19,7 @@ SRC_URI = "git://gitlab.freedesktop.org/pkg-config/pkg-config.git;branch=master;
                   file://0001-Backport-g-s-size-g-u-intptr-atomics-in-builtin-glib.patch \
            "
 
-inherit autotools
+inherit autotools pkgconfig
 
 # Because of a faulty test, the current auto mode always evaluates to no,
 # so just continue that behaviour.
@@ -29,7 +29,7 @@ EXTRA_OECONF += "--disable-indirect-deps"
 PACKAGECONFIG ??= "glib"
 PACKAGECONFIG:class-native = ""
 
-PACKAGECONFIG[glib] = "--without-internal-glib,--with-internal-glib,glib-2.0 pkgconfig-native"
+PACKAGECONFIG[glib] = "--without-internal-glib,--with-internal-glib,glib-2.0"
 
 BBCLASSEXTEND = "native nativesdk"