diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-15 14:34:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-15 14:35:49 +0000 |
| commit | 2f5682dbc26067f3fe050889e96ebc70716abd90 (patch) | |
| tree | d72656312186545e6f1b3e3a910ea63ace395a5c /external | |
| parent | 78dbfa9fff9c408108112302640e0cfb8aa53a11 (diff) | |
include stdint.h earlier to ensure SIZE_MAX
Change-Id: I592600e4600bfb360a154a450fcc6135f4fc3008
Diffstat (limited to 'external')
| -rw-r--r-- | external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk | 1 | ||||
| -rw-r--r-- | external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk index 7f974228d5d0..5fdc5e4cc8d1 100644 --- a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk +++ b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,jpeg-turbo,0)) $(eval $(call gb_UnpackedTarball_add_patches,jpeg-turbo,\ external/jpeg-turbo/jpeg-turbo.build.patch.1 \ $(if $(filter WNT,$(OS)),external/jpeg-turbo/jpeg-turbo.win_build.patch.1) \ + external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 \ external/jpeg-turbo/ubsan.patch \ )) diff --git a/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 b/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 new file mode 100644 index 000000000000..66acb5298513 --- /dev/null +++ b/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 @@ -0,0 +1,18 @@ +diff -ur jpeg.org/Makefile.am jpeg/Makefile.am +--- jpeg.org/jmemmgr.c 2017-03-15 14:29:29.286587049 +0000 ++++ jpeg/jmemmgr.c 2017-03-15 14:31:21.096378506 +0000 +@@ -27,12 +27,13 @@ + * memory then you shouldn't care about a little bit of unused code...) + */ + ++#include <stdint.h> ++ + #define JPEG_INTERNALS + #define AM_MEMORY_MANAGER /* we define jvirt_Xarray_control structs */ + #include "jinclude.h" + #include "jpeglib.h" + #include "jmemsys.h" /* import the system-dependent declarations */ +-#include <stdint.h> + + #ifndef NO_GETENV + #ifndef HAVE_STDLIB_H /* <stdlib.h> should declare getenv() */ |