diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2023-12-26 15:00:33 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-12-29 09:04:17 -0800 |
| commit | 85360acc4d93e135a647bf4819b9ba524df3cdf0 (patch) | |
| tree | 4fcc91cdd8d916b619c85c5c442958040d0ccdfa /meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch | |
| parent | 51648324086a34abe212c659ce3e6b70edd0e210 (diff) | |
| download | meta-openembedded-85360acc4d93e135a647bf4819b9ba524df3cdf0.tar.gz | |
jasper: Fix install conflict when enable multilib.
Error: Transaction test error:
file /usr/include/jasper/jas_config.h conflicts between attempted installs of lib32-jasper-dev-4.1.1-r0.armv7ahf_neon and jasper-dev-4.1.1-r0.cortexa57
The differences between the two files are as follows:
@@ -44,10 +44,10 @@
/* #undef JAS_HAVE_INT128_T */
#define JAS_SIZEOF_INT 4
-#define JAS_SIZEOF_LONG 4
+#define JAS_SIZEOF_LONG 8
#define JAS_SIZEOF_LLONG 8
-#define JAS_SIZEOF_SIZE_T 4
-#define JAS_SIZEOF_SSIZE_T 4
+#define JAS_SIZEOF_SIZE_T 8
+#define JAS_SIZEOF_SSIZE_T 8
#define JAS_HAVE_FCNTL_H
/* #undef JAS_HAVE_IO_H */
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch')
0 files changed, 0 insertions, 0 deletions