[gnome-continuous-yocto/gnomeostree-3.28-rocko: 205/218] tiff: Fix multilib header conflict - tiffconf.h
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 205/218] tiff: Fix multilib header conflict - tiffconf.h
- Date: Mon, 21 May 2018 08:52:29 +0000 (UTC)
commit 68fb7d153cb8a0981ecb0ea010e60446a73f46d4
Author: Zhang Xiao <xiao zhang windriver com>
Date: Sun Mar 11 17:32:55 2018 -0700
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>
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 cb91baa..ebee6f8 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
# 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"
@@ -51,4 +51,8 @@ PACKAGES =+ "tiffxx tiff-utils"
FILES_tiffxx = "${libdir}/libtiffxx.so.*"
FILES_tiff-utils = "${bindir}/*"
+do_install_append() {
+ oe_multilib_header tiffconf.h
+}
+
BBCLASSEXTEND = "native"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]