summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-01-28 17:44:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-28 18:01:47 +0000
commit9f6cd59aa14dbcb12d3aab18211a2644c190c96f (patch)
treec79ea09d830cecfdd1a7e665327e923519d2d0ee
parentced097eb4e30133acc6c3e9ed841b3463844cd39 (diff)
downloadpoky-9f6cd59aa14dbcb12d3aab18211a2644c190c96f.tar.gz
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. (From OE-Core rev: 99b263285f0ee60b4336992251840e418aa695c4) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h6
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig.inc12
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig/glibconfig-sysdefs.h6
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 1329e7f21c..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h
+++ /dev/null
@@ -1,6 +0,0 @@
1#define GLIB_SYSDEF_POLLIN =1
2#define GLIB_SYSDEF_POLLOUT =4
3#define GLIB_SYSDEF_POLLPRI =2
4#define GLIB_SYSDEF_POLLERR =8
5#define GLIB_SYSDEF_POLLHUP =16
6#define GLIB_SYSDEF_POLLNVAL =32
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 3e655a93e2..62c886fce1 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -8,7 +8,7 @@ SECTION = "console/utils"
8LICENSE = "GPLv2+" 8LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
10 10
11DEPENDS = "glib-2.0 popt" 11DEPENDS = "glib-2.0"
12DEPENDS_class-native = "" 12DEPENDS_class-native = ""
13DEPENDS_class-nativesdk = "" 13DEPENDS_class-nativesdk = ""
14 14
@@ -18,15 +18,11 @@ S = "${WORKDIR}/pkg-config-${PV}/"
18 18
19inherit autotools 19inherit autotools
20 20
21EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts --with-internal-glib" 21EXTRA_OECONF = "--without-internal-glib"
22EXTRA_OECONF_class-native = "--disable-legacy-scripts --with-internal-glib" 22EXTRA_OECONF_class-native = "--with-internal-glib"
23EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts --with-internal-glib" 23EXTRA_OECONF_class-nativesdk = "--with-internal-glib"
24 24
25acpaths = "-I ." 25acpaths = "-I ."
26do_configure_prepend () {
27 mkdir --parents ${B}/glib-1.2.10
28 install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h ${B}/glib-1.2.10/
29}
30 26
31BBCLASSEXTEND = "native nativesdk" 27BBCLASSEXTEND = "native nativesdk"
32 28
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 1329e7f21c..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/glibconfig-sysdefs.h
+++ /dev/null
@@ -1,6 +0,0 @@
1#define GLIB_SYSDEF_POLLIN =1
2#define GLIB_SYSDEF_POLLOUT =4
3#define GLIB_SYSDEF_POLLPRI =2
4#define GLIB_SYSDEF_POLLERR =8
5#define GLIB_SYSDEF_POLLHUP =16
6#define GLIB_SYSDEF_POLLNVAL =32