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-graphics | |
| 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-graphics')
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-graphics/freetype/freetype_2.5.3.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index f2518e9396..51dc09bc10 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -19,7 +19,9 @@ S = "${WORKDIR}/DirectFB-${PV}" LDFLAGS_append =" -lts -lm" -inherit autotools binconfig pkgconfig +BINCONFIG = "${bindir}/directfb-config" + +inherit autotools binconfig-disabled pkgconfig PACKAGECONFIG ??= "" PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" diff --git a/meta/recipes-graphics/freetype/freetype_2.5.3.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb index 122b8c04da..2c861de63a 100644 --- a/meta/recipes-graphics/freetype/freetype_2.5.3.bb +++ b/meta/recipes-graphics/freetype/freetype_2.5.3.bb @@ -17,7 +17,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2" SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65" SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e" -inherit autotools-brokensep pkgconfig binconfig multilib_header +BINCONFIG = "${bindir}/freetype-config" + +inherit autotools-brokensep pkgconfig binconfig-disabled multilib_header LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index 4a7712116f..f81d862cdc 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -30,7 +30,9 @@ S = "${WORKDIR}/SDL-${PV}" SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85" SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00" -inherit autotools lib_package binconfig pkgconfig +BINCONFIG = "${bindir}/sdl-config" + +inherit autotools lib_package binconfig-disabled pkgconfig EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \ --enable-file --disable-oss --disable-esd --disable-arts \ |