diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-22 10:59:33 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-16 15:30:49 +0100 |
| commit | 5870bd272b0b077d0826fb900b251884c1c05061 (patch) | |
| tree | fad509af7e149992d176d9a14f7559d66f794838 /meta/recipes-core | |
| parent | 12bab2d828836c8926f753caff80b61dbe6390a5 (diff) | |
| download | openembedded-core-5870bd272b0b077d0826fb900b251884c1c05061.tar.gz openembedded-core-5870bd272b0b077d0826fb900b251884c1c05061.tar.bz2 openembedded-core-5870bd272b0b077d0826fb900b251884c1c05061.zip | |
binconfig-disabled: Add class and use
This adds a binconfig-disabled class which can be used by recipes where
a -config file is installed but we wish to disable it and just rely on
the .pc files instead.
Rather than simply deleting it, we make the script "exit 1" so that it
can be found in PATH and raise a build error rather than something
silently falling back to the build system for example.
Rather than randomly finding -config files, this adds in the
specification of a list of binconfig scripts which is more deterministic
and maintainable moving forward.
This patch converts various users in OE-Core to use this, a world build
of OE-Core tests out ok with this change. There will likely be issues in
other layers however, hence this being a RFT.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index 1401c731b8..e0b50cf207 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -22,7 +22,9 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ file://python-sitepackages-dir.patch \ " -inherit autotools pkgconfig binconfig pythonnative ptest +BINCONFIG = "${bindir}/xml2-config" + +inherit autotools pkgconfig binconfig-disabled pythonnative ptest RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141" diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index f0a4044345..521d0e435c 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -8,7 +8,9 @@ DEPENDS = "ncurses-native" DEPENDS_class-native = "" INC_PR = "r15" -inherit autotools binconfig multilib_header +BINCONFIG = "${bindir}/ncurses-config" + +inherit autotools binconfig-disabled multilib_header # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz" |