summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2016-10-05 23:04:54 +0000
committerJohn-Mark Bell <jmb@netsurf-browser.org>2016-10-05 23:50:42 +0000
commit09cfbcf9a19a5865701ff81638a0f72270c975e2 (patch)
tree61cb52c3d97c9d793fac0320a9451f64b18643cf
parent16e5293dbc02632abe063e187d5eefddc43e8e0b (diff)
downloadtoolchains-09cfbcf9a19a5865701ff81638a0f72270c975e2.tar.gz
toolchains-09cfbcf9a19a5865701ff81638a0f72270c975e2.tar.bz2
SDK: fix libjpeg-turbo for ppc-amigaos
-rw-r--r--sdk/Makefile3
-rw-r--r--sdk/recipes/patches/libjpegturbo/ppc-amigaos/jmemmgr.c.p10
2 files changed, 13 insertions, 0 deletions
diff --git a/sdk/Makefile b/sdk/Makefile
index e6f0dc0..395ec04 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -391,6 +391,9 @@ $(BUILDSTEPS)/libjpeg-turbo.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libjpeg-tu
mkdir -p $(LIBJPEG_TURBO_BUILDDIR)
cd $(LIBJPEG_TURBO_BUILDDIR) && tar xaf $(SOURCEDIR)/libjpeg-turbo-src-$(VERSION_LIBJPEG_TURBO).tar.gz
for p in `ls $(RECIPES)/patches/libjpegturbo/*.p` ; do $(PATCH) -d $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO) -p0 <$$p ; done
+ifneq ($(realpath $(RECIPES)/patches/libjpegturbo/$(TARGET)),)
+ for p in `ls $(RECIPES)/patches/libjpegturbo/$(TARGET)/*.p` ; do $(PATCH) -d $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO) -p0 <$$p ; done
+endif
cd $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO) && $(env) $(LIBJPEG_TURBO_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO) && $(env) make install
touch $@
diff --git a/sdk/recipes/patches/libjpegturbo/ppc-amigaos/jmemmgr.c.p b/sdk/recipes/patches/libjpegturbo/ppc-amigaos/jmemmgr.c.p
new file mode 100644
index 0000000..f0bf615
--- /dev/null
+++ b/sdk/recipes/patches/libjpegturbo/ppc-amigaos/jmemmgr.c.p
@@ -0,0 +1,10 @@
+--- jmemmgr.c.old 2016-10-05 22:58:26.559475774 +0000
++++ jmemmgr.c 2016-10-05 23:00:00.731473878 +0000
+@@ -32,6 +32,7 @@
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jmemsys.h" /* import the system-dependent declarations */
++#include <limits.h>
+ #include <stdint.h>
+
+ #ifndef NO_GETENV