diff options
author | Zhang Xiao <xiao.zhang@windriver.com> | 2018-03-11 17:32:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-26 15:07:11 +0100 |
commit | 68fb7d153cb8a0981ecb0ea010e60446a73f46d4 (patch) | |
tree | d1f4423731a3eff86bcf48e7abad861475562d5d | |
parent | 3fae046acfda2848de77268b05ac3601417fc8ca (diff) | |
download | poky-68fb7d153cb8a0981ecb0ea010e60446a73f46d4.tar.gz |
tiff: Fix multilib header conflict - tiffconf.h
Header file conflict between 32-bit and 64-bit versions.
(From OE-Core rev: 53f320797765b5f184a83cd065f9b5e454ee14e3)
(From OE-Core rev: 837f8df7bd5767e49ce59b2b1e5a4a65d1bfa276)
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/libtiff/tiff_4.0.8.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.8.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.8.bb index cb91baa607..ebee6f808f 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.0.8.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.8.bb | |||
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390d | |||
20 | # exclude betas | 20 | # exclude betas |
21 | UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar" | 21 | UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar" |
22 | 22 | ||
23 | inherit autotools | 23 | inherit autotools multilib_header |
24 | 24 | ||
25 | CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no" | 25 | CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no" |
26 | 26 | ||
@@ -51,4 +51,8 @@ PACKAGES =+ "tiffxx tiff-utils" | |||
51 | FILES_tiffxx = "${libdir}/libtiffxx.so.*" | 51 | FILES_tiffxx = "${libdir}/libtiffxx.so.*" |
52 | FILES_tiff-utils = "${bindir}/*" | 52 | FILES_tiff-utils = "${bindir}/*" |
53 | 53 | ||
54 | do_install_append() { | ||
55 | oe_multilib_header tiffconf.h | ||
56 | } | ||
57 | |||
54 | BBCLASSEXTEND = "native" | 58 | BBCLASSEXTEND = "native" |