[OE-core] [PATCH] pkgconfig: remove out-dated configure options and dependencies
Ross Burton
ross.burton at intel.com
Tue Jan 28 17:44:04 UTC 2014
0.27 onwards uses a snapshot of glib 2 not glib 1, so drop the
do_configure_prepend and update the internal/installed options as appropriate.
Legacy scripts were removed in 0.26.
Use of popt was removed in 0.28.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-devtools/pkgconfig/pkgconfig.inc | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 3e655a9..62c886f 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -8,7 +8,7 @@ SECTION = "console/utils"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "glib-2.0 popt"
+DEPENDS = "glib-2.0"
DEPENDS_class-native = ""
DEPENDS_class-nativesdk = ""
@@ -18,15 +18,11 @@ S = "${WORKDIR}/pkg-config-${PV}/"
inherit autotools
-EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts --with-internal-glib"
-EXTRA_OECONF_class-native = "--disable-legacy-scripts --with-internal-glib"
-EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts --with-internal-glib"
+EXTRA_OECONF = "--without-internal-glib"
+EXTRA_OECONF_class-native = "--with-internal-glib"
+EXTRA_OECONF_class-nativesdk = "--with-internal-glib"
acpaths = "-I ."
-do_configure_prepend () {
- mkdir --parents ${B}/glib-1.2.10
- install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h ${B}/glib-1.2.10/
-}
BBCLASSEXTEND = "native nativesdk"
--
1.7.10.4
More information about the Openembedded-core
mailing list