summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/freetype
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-22 10:59:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-16 15:30:49 +0100
commit5870bd272b0b077d0826fb900b251884c1c05061 (patch)
treefad509af7e149992d176d9a14f7559d66f794838 /meta/recipes-graphics/freetype
parent12bab2d828836c8926f753caff80b61dbe6390a5 (diff)
downloadopenembedded-core-contrib-5870bd272b0b077d0826fb900b251884c1c05061.tar.gz
openembedded-core-contrib-5870bd272b0b077d0826fb900b251884c1c05061.tar.bz2
openembedded-core-contrib-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/freetype')
-rw-r--r--meta/recipes-graphics/freetype/freetype_2.5.3.bb4
1 files changed, 3 insertions, 1 deletions
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}'"