diff options
| -rw-r--r-- | tools/depends/target/gnutls/Makefile | 4 | ||||
| -rw-r--r-- | tools/depends/target/gnutls/size-max.patch | 15 | ||||
| -rw-r--r-- | tools/depends/target/openssl/Makefile | 8 |
3 files changed, 19 insertions, 8 deletions
diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile index df45d17f18..bbf4fa0a9e 100644 --- a/tools/depends/target/gnutls/Makefile +++ b/tools/depends/target/gnutls/Makefile @@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=gnutls -VERSION=3.3.10 +VERSION=3.3.15 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.xz @@ -14,7 +14,7 @@ endif # configuration settings CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ - ./configure --prefix=$(PREFIX) --disable-shared --without-p11-kit --disable-nls --enable-local-libopts + ./configure --prefix=$(PREFIX) --disable-shared --without-p11-kit --disable-nls --enable-local-libopts --disable-doc LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a diff --git a/tools/depends/target/gnutls/size-max.patch b/tools/depends/target/gnutls/size-max.patch index f2adfc65e0..4cd927bf37 100644 --- a/tools/depends/target/gnutls/size-max.patch +++ b/tools/depends/target/gnutls/size-max.patch @@ -1,5 +1,16 @@ ---- gl/read-file.c.orig 2014-11-24 10:06:35.473877332 +0100 -+++ gl/read-file.c 2014-11-24 10:03:34.005876607 +0100 +--- gl/read-file.c.orig 2014-11-24 10:06:35.473877332 +0100 ++++ gl/read-file.c 2014-11-24 10:03:34.005876607 +0100 +@@ -27,6 +27,7 @@ + + /* Get SIZE_MAX. */ + #include <stdint.h> ++#include <limits.h> + + /* Get malloc, realloc, free. */ + #include <stdlib.h> + +--- src/gl/read-file.c.orig 2014-11-24 10:06:35.473877332 +0100 ++++ src/gl/read-file.c 2014-11-24 10:03:34.005876607 +0100 @@ -27,6 +27,7 @@ /* Get SIZE_MAX. */ diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile index 01014ff342..2ef5cff714 100644 --- a/tools/depends/target/openssl/Makefile +++ b/tools/depends/target/openssl/Makefile @@ -3,14 +3,14 @@ DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=openssl -VERSION=1.0.1j +VERSION=1.0.2d SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz # configuration settings -CONFIGURE=MACHINE=$(PLATFORM) ./config shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib no-asm +CONFIGURE=MACHINE=$(PLATFORM) ./config shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib ifeq ($(OS), android) - CONFIGURE=./Configure shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib no-asm linux-generic32 + CONFIGURE=./Configure shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib linux-generic32 endif ifeq ($(OS), ios) # No darwin-arm-cc so use darwin-i386-cc and patch files after configure @@ -49,7 +49,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) fi $(LIBDYLIB): $(PLATFORM) - $(MAKE) -j 1 -C $(PLATFORM) + $(MAKE) -C $(PLATFORM) touch $@ .installed-$(PLATFORM): $(LIBDYLIB) |