mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

pkgconfig: remove out-dated configure options and dependencies

Browse Source 
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>
This commit is contained in:
Ross Burton
2014-01-28 17:44:04 +00:00
committed by Richard Purdie
parent ced097eb4e
commit 9f6cd59aa1
3 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h
View File

@@ -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

12
meta/recipes-devtools/pkgconfig/pkgconfig.inc
View File

@@ -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"

6
meta/recipes-devtools/pkgconfig/pkgconfig/glibconfig-sysdefs.h
View File

@@ -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