summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2018-08-30 15:52:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-04 11:03:55 +0100
commit011ab977bd45b0e34a381f0c3af4f4008e12e5e8 (patch)
treedc5d7625cd2ec898ff7244f82598812fb3187893
parenta6ea6216bdbf86fba38400ba02a8dd77165f7a8b (diff)
downloadpoky-011ab977bd45b0e34a381f0c3af4f4008e12e5e8.tar.gz
libjpeg-turbo: fix wrongly defined HAVE_STDLIB_H
After uprade to 2.0.0, build system change from autotools to cmake, wrong usage of #cmakedefine cause wrongly defined HAVE_STDLIB_H, which cause some other package compile failed. (From OE-Core rev: d1e09cb2521ccb9d02ced2d61abb4034cb04836d) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch119
-rw-r--r--meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb3
2 files changed, 121 insertions, 1 deletions
diff --git a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch
new file mode 100644
index 0000000000..16767ebb6b
--- /dev/null
+++ b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch
@@ -0,0 +1,119 @@
1From d301019d0f23d12b9666d3d88b0859067a4ade77 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 30 Aug 2018 15:08:23 +0800
4Subject: [PATCH] libjpeg-turbo: fix wrongly defined define HAVE_STDLIB_H
5
6when change build system from autotools to cmake, below
7part is replace wrongly:
8
9"#undef HAVE_STDLIB_H"
10should be change to "#cmakedefine HAVE_STDLIB_H 1"
11not "#cmakedefine HAVE_STDLIB_H"
12
13otherwise, even if stdlib.h is found, output file
14of configure_file() will define like: #define HAVE_STDLIB_H
15but we need it as #define HAVE_STDLIB_H 1, since for
16different defination of HAVE_STDLIB_H will cause below error:
17error: "HAVE_STDLIB_H" redefined [-Werror]
18
19Upstream-Status: Submitted[https://github.com/libjpeg-turbo/libjpeg-turbo/pull/275]
20
21Signed-off-by: Changqing Li <changqing.li@windriver.com>
22---
23 jconfig.h.in | 28 ++++++++++++++--------------
24 jconfigint.h.in | 4 ++--
25 2 files changed, 16 insertions(+), 16 deletions(-)
26
27diff --git a/jconfig.h.in b/jconfig.h.in
28index 2842754..18a69a4 100644
29--- a/jconfig.h.in
30+++ b/jconfig.h.in
31@@ -10,16 +10,16 @@
32 #define LIBJPEG_TURBO_VERSION_NUMBER @LIBJPEG_TURBO_VERSION_NUMBER@
33
34 /* Support arithmetic encoding */
35-#cmakedefine C_ARITH_CODING_SUPPORTED
36+#cmakedefine C_ARITH_CODING_SUPPORTED 1
37
38 /* Support arithmetic decoding */
39-#cmakedefine D_ARITH_CODING_SUPPORTED
40+#cmakedefine D_ARITH_CODING_SUPPORTED 1
41
42 /* Support in-memory source/destination managers */
43-#cmakedefine MEM_SRCDST_SUPPORTED
44+#cmakedefine MEM_SRCDST_SUPPORTED 1
45
46 /* Use accelerated SIMD routines. */
47-#cmakedefine WITH_SIMD
48+#cmakedefine WITH_SIMD 1
49
50 /*
51 * Define BITS_IN_JSAMPLE as either
52@@ -33,37 +33,37 @@
53 #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */
54
55 /* Define to 1 if you have the <locale.h> header file. */
56-#cmakedefine HAVE_LOCALE_H
57+#cmakedefine HAVE_LOCALE_H 1
58
59 /* Define to 1 if you have the <stddef.h> header file. */
60-#cmakedefine HAVE_STDDEF_H
61+#cmakedefine HAVE_STDDEF_H 1
62
63 /* Define to 1 if you have the <stdlib.h> header file. */
64-#cmakedefine HAVE_STDLIB_H
65+#cmakedefine HAVE_STDLIB_H 1
66
67 /* Define if you need to include <sys/types.h> to get size_t. */
68-#cmakedefine NEED_SYS_TYPES_H
69+#cmakedefine NEED_SYS_TYPES_H 1
70
71 /* Define if you have BSD-like bzero and bcopy in <strings.h> rather than
72 memset/memcpy in <string.h>. */
73-#cmakedefine NEED_BSD_STRINGS
74+#cmakedefine NEED_BSD_STRINGS 1
75
76 /* Define to 1 if the system has the type `unsigned char'. */
77-#cmakedefine HAVE_UNSIGNED_CHAR
78+#cmakedefine HAVE_UNSIGNED_CHAR 1
79
80 /* Define to 1 if the system has the type `unsigned short'. */
81-#cmakedefine HAVE_UNSIGNED_SHORT
82+#cmakedefine HAVE_UNSIGNED_SHORT 1
83
84 /* Compiler does not support pointers to undefined structures. */
85-#cmakedefine INCOMPLETE_TYPES_BROKEN
86+#cmakedefine INCOMPLETE_TYPES_BROKEN 1
87
88 /* Define if your (broken) compiler shifts signed values as if they were
89 unsigned. */
90-#cmakedefine RIGHT_SHIFT_IS_UNSIGNED
91+#cmakedefine RIGHT_SHIFT_IS_UNSIGNED 1
92
93 /* Define to 1 if type `char' is unsigned and you are not using gcc. */
94 #ifndef __CHAR_UNSIGNED__
95- #cmakedefine __CHAR_UNSIGNED__
96+ #cmakedefine __CHAR_UNSIGNED__ 1
97 #endif
98
99 /* Define to empty if `const' does not conform to ANSI C. */
100diff --git a/jconfigint.h.in b/jconfigint.h.in
101index 55df053..6c898ac 100644
102--- a/jconfigint.h.in
103+++ b/jconfigint.h.in
104@@ -17,10 +17,10 @@
105 #define SIZEOF_SIZE_T @SIZE_T@
106
107 /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
108-#cmakedefine HAVE_BUILTIN_CTZL
109+#cmakedefine HAVE_BUILTIN_CTZL 1
110
111 /* Define to 1 if you have the <intrin.h> header file. */
112-#cmakedefine HAVE_INTRIN_H
113+#cmakedefine HAVE_INTRIN_H 1
114
115 #if defined(_MSC_VER) && defined(HAVE_INTRIN_H)
116 #if (SIZEOF_SIZE_T == 8)
117--
1182.7.4
119
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb
index 7737a593b0..282bf95e8a 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb
@@ -11,7 +11,8 @@ DEPENDS_append_x86-64_class-target = " nasm-native"
11DEPENDS_append_x86_class-target = " nasm-native" 11DEPENDS_append_x86_class-target = " nasm-native"
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ 13SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
14 file://0001-libjpeg-turbo-fix-package_qa-error.patch" 14 file://0001-libjpeg-turbo-fix-package_qa-error.patch \
15 file://0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch"
15 16
16SRC_URI[md5sum] = "b12a3fcf1d078db38410f27718a91b83" 17SRC_URI[md5sum] = "b12a3fcf1d078db38410f27718a91b83"
17SRC_URI[sha256sum] = "778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868" 18SRC_URI[sha256sum] = "778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868"