[oe-commits] Ross Burton : pkgconfig: remove out-dated configure options and dependencies

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 99b263285f0ee60b4336992251840e418aa695c4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=99b263285f0ee60b4336992251840e418aa695c4

Author: Ross Burton <ross.burton at intel.com>
Date:   Tue Jan 28 17:44:04 2014 +0000

pkgconfig: remove out-dated configure options and dependencies

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>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h            |  6 ------
 meta/recipes-devtools/pkgconfig/pkgconfig.inc                | 12 ++++--------
 .../pkgconfig/pkgconfig/glibconfig-sysdefs.h                 |  6 ------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h
deleted file mode 100644
index 1329e7f..0000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define GLIB_SYSDEF_POLLIN =1
-#define GLIB_SYSDEF_POLLOUT =4
-#define GLIB_SYSDEF_POLLPRI =2
-#define GLIB_SYSDEF_POLLERR =8
-#define GLIB_SYSDEF_POLLHUP =16
-#define GLIB_SYSDEF_POLLNVAL =32
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"
 
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/glibconfig-sysdefs.h b/meta/recipes-devtools/pkgconfig/pkgconfig/glibconfig-sysdefs.h
deleted file mode 100644
index 1329e7f..0000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/glibconfig-sysdefs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define GLIB_SYSDEF_POLLIN =1
-#define GLIB_SYSDEF_POLLOUT =4
-#define GLIB_SYSDEF_POLLPRI =2
-#define GLIB_SYSDEF_POLLERR =8
-#define GLIB_SYSDEF_POLLHUP =16
-#define GLIB_SYSDEF_POLLNVAL =32