aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Xiao <xiao.zhang@windriver.com>2018-03-11 17:32:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 03:38:48 -0700
commit53f320797765b5f184a83cd065f9b5e454ee14e3 (patch)
treed4aae3896ec39c2e5dda1bb835b37a22d3adfb19
parent6084879306db61c347b6f01f3bb64de327a9052d (diff)
downloadopenembedded-core-contrib-53f320797765b5f184a83cd065f9b5e454ee14e3.tar.gz
openembedded-core-contrib-53f320797765b5f184a83cd065f9b5e454ee14e3.tar.bz2
openembedded-core-contrib-53f320797765b5f184a83cd065f9b5e454ee14e3.zip
tiff: Fix multilib header conflict - tiffconf.h
Header file conflict between 32-bit and 64-bit versions. Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-multimedia/libtiff/tiff_4.0.9.bb6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
index 57bf7408d09..b8f895b1435 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c00
# exclude betas
UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar"
-inherit autotools
+inherit autotools multilib_header
CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no"
@@ -45,4 +45,8 @@ PACKAGES =+ "tiffxx tiff-utils"
FILES_tiffxx = "${libdir}/libtiffxx.so.*"
FILES_tiff-utils = "${bindir}/*"
+do_install_append() {
+ oe_multilib_header tiffconf.h
+}
+
BBCLASSEXTEND = "native"