summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-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