summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/libpng
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:31:40 +0100
commit3476a49b10093c58b2f89e3d9a8527224f1bd7f6 (patch)
tree369d23a1d434e43284ea2bdffa318f5408b13014 /meta/recipes-multimedia/libpng
parent3a88df915831f2fd5e46ed71b21190398d1de0f1 (diff)
downloadpoky-3476a49b10093c58b2f89e3d9a8527224f1bd7f6.tar.gz
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. (From OE-Core rev: 5870bd272b0b077d0826fb900b251884c1c05061) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libpng')
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.6.10.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb b/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
index 0f514f8b73..babf87e392 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
@@ -15,7 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}
15SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768" 15SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768"
16SRC_URI[sha256sum] = "4003f0fd0e36110a2b742fc5b9e1ab93ed7a7ab57ae8dc65f0e8101458775a56" 16SRC_URI[sha256sum] = "4003f0fd0e36110a2b742fc5b9e1ab93ed7a7ab57ae8dc65f0e8101458775a56"
17 17
18inherit autotools binconfig pkgconfig 18BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
19
20inherit autotools binconfig-disabled pkgconfig
19 21
20# Work around missing symbols 22# Work around missing symbols
21EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" 23EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"