summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
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 06:27:19 -0700
commit5ae48065297d595cfe1f01c4bd878c757f8ce69c (patch)
treeca83e4233ad73333727eb6928fb9e80535d1c996 /meta/recipes-multimedia
parent1cab8ef694a323b68fa2c5533dbd3f4968f8b4d6 (diff)
downloadpoky-5ae48065297d595cfe1f01c4bd878c757f8ce69c.tar.gz
tiff: Fix multilib header conflict - tiffconf.h
Header file conflict between 32-bit and 64-bit versions. (From OE-Core rev: 53f320797765b5f184a83cd065f9b5e454ee14e3) Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-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 57bf7408d0..b8f895b143 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
14# exclude betas 14# exclude betas
15UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar" 15UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar"
16 16
17inherit autotools 17inherit autotools multilib_header
18 18
19CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no" 19CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no"
20 20
@@ -45,4 +45,8 @@ PACKAGES =+ "tiffxx tiff-utils"
45FILES_tiffxx = "${libdir}/libtiffxx.so.*" 45FILES_tiffxx = "${libdir}/libtiffxx.so.*"
46FILES_tiff-utils = "${bindir}/*" 46FILES_tiff-utils = "${bindir}/*"
47 47
48do_install_append() {
49 oe_multilib_header tiffconf.h
50}
51
48BBCLASSEXTEND = "native" 52BBCLASSEXTEND = "native"