pkgconfig: add patch to disable legacy scripts such as glib-config

On an F13 host with glib-config installed pkgconfig-native can get into a
horrible state with recursive calls between pkg-config and glib-config.
The patch adds a configure time option to disable legacy script support in
pkgconfig and makes use of the option for Poky.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/meta/packages/pkgconfig/pkgconfig.inc b/meta/packages/pkgconfig/pkgconfig.inc
index 463faf3fad..c64037299e 100644
--- a/meta/packages/pkgconfig/pkgconfig.inc
+++ b/meta/packages/pkgconfig/pkgconfig.inc
@@ -5,19 +5,20 @@ It replaces the ubiquitous *-config scripts you may have \
 seen with a single tool."
 HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
 LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
 
 DEPENDS = "glib-2.0"
 DEPENDS_virtclass-native = ""
 DEPENDS_virtclass-nativesdk = ""
-EXTRA_OECONF = "--with-installed-glib"
-EXTRA_OECONF_virtclass-native = ""
-EXTRA_OECONF_virtclass-nativesdk = ""
+EXTRA_OECONF = "--with-installed-glib --disable-legacy-scripts"
+EXTRA_OECONF_virtclass-native = "--disable-legacy-scripts"
+EXTRA_OECONF_virtclass-nativesdk = "--disable-legacy-scripts"
 
 SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
-           file://autofoo.patch;patch=1 \
-           file://sysrootfix.patch;patch=1 \
-           file://glibconfig-sysdefs.h"
+           file://autofoo.patch \
+           file://sysrootfix.patch \
+           file://glibconfig-sysdefs.h \
+           file://disable-legacy.patch"
 
 S = "${WORKDIR}/pkg-config-${PV}/"