Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From d301019d0f23d12b9666d3d88b0859067a4ade77 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Thu, 30 Aug 2018 15:08:23 +0800 |
| 4 | Subject: [PATCH] libjpeg-turbo: fix wrongly defined define HAVE_STDLIB_H |
| 5 | |
| 6 | when change build system from autotools to cmake, below |
| 7 | part is replace wrongly: |
| 8 | |
| 9 | "#undef HAVE_STDLIB_H" |
| 10 | should be change to "#cmakedefine HAVE_STDLIB_H 1" |
| 11 | not "#cmakedefine HAVE_STDLIB_H" |
| 12 | |
| 13 | otherwise, even if stdlib.h is found, output file |
| 14 | of configure_file() will define like: #define HAVE_STDLIB_H |
| 15 | but we need it as #define HAVE_STDLIB_H 1, since for |
| 16 | different defination of HAVE_STDLIB_H will cause below error: |
| 17 | error: "HAVE_STDLIB_H" redefined [-Werror] |
| 18 | |
| 19 | Upstream-Status: Submitted[https://github.com/libjpeg-turbo/libjpeg-turbo/pull/275] |
| 20 | |
| 21 | Signed-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 | |
| 27 | diff --git a/jconfig.h.in b/jconfig.h.in |
| 28 | index 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. */ |
| 100 | diff --git a/jconfigint.h.in b/jconfigint.h.in |
| 101 | index 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 | -- |
| 118 | 2.7.4 |
| 119 | |