diff options
author | Ole Loots <ole@monochrom.net> | 2013-10-07 22:32:05 +0200 |
---|---|---|
committer | Ole Loots <ole@monochrom.net> | 2013-10-07 22:32:05 +0200 |
commit | b550d0afa876ad2aa760e17a3b1b4258baed7c25 (patch) | |
tree | 1b0f17eeba194f51a510847157b820ab94a1c8e0 | |
parent | 77afcbf8fbafe349bd678f8ecdb3d1c091410428 (diff) | |
parent | a6739b5d0c7cd91b87ae56b213e4ce91d0be2846 (diff) | |
download | toolchains-b550d0afa876ad2aa760e17a3b1b4258baed7c25.tar.gz toolchains-b550d0afa876ad2aa760e17a3b1b4258baed7c25.tar.bz2 |
Merge branch 'master' into mono/atari-adjustments
-rw-r--r-- | sdk/Makefile | 16 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p | 13 |
2 files changed, 9 insertions, 20 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index 55a2314..f130088 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -27,8 +27,8 @@ VERSION_ZLIB := 1.2.7 VERSION_LIBICONV := 1.13.1 VERSION_LIBTRE := 0.8.0 VERSION_LIBXML := 2.8.0 -VERSION_OPENSSL := 1.0.1c -VERSION_LIBPNG := 1.5.13 +VERSION_OPENSSL := 1.0.1e +VERSION_LIBPNG := 1.6.1 VERSION_LIBJPEG := 8d VERSION_LIBLCMS := 2.3 VERSION_LIBMNG := 1.0.10 @@ -75,7 +75,7 @@ BUILDSTEPS := $(BUILDDIR)/build-steps # Compute the SDK components SDK_ITEMS := -COMMON_SDK_ITEMS := zlib.d libxml2.d openssl.d libpng.d libjpeg.d liblcms.d \ +COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libjpeg.d liblcms.d \ libmng.d libcares.d libcurl.d libexpat.d LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap telnet gopher tftp pop3 imap smtp manual) @@ -441,17 +441,17 @@ $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz: # libcurl $(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl.d $(BUILDSTEPS)/libcares.d $(BUILDSTEPS)/libcurl-src.d + cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) CFLAGS="" ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-libidn ${EXTRAARGS_LIBCURL} + cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) make install + touch $@ + +$(BUILDSTEPS)/libcurl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2 mkdir -p $(BUILDDIR)/libcurl cd $(BUILDDIR)/libcurl && tar xjf $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2 for p in `ls $(RECIPES)/patches/libcurl/*.p` ; do patch -d $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) -p0 <$$p ; done ifneq ($(realpath $(RECIPES)/patches/libcurl/$(TARGET)),) for p in `ls $(RECIPES)/patches/libcurl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) -p0 <$$p ; done endif - cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-libidn ${EXTRAARGS_LIBCURL} - cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) make install - touch $@ - -$(BUILDSTEPS)/libcurl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2 touch $@ $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2: diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p index 38232d1..898748b 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p @@ -1,14 +1,3 @@ ---- crypto/asn1/bio_ndef.c.orig 2011-03-08 22:18:51.000000000 +0000 -+++ crypto/asn1/bio_ndef.c 2011-03-08 22:19:03.000000000 +0000 -@@ -58,7 +58,7 @@ - #include <openssl/err.h> - - #ifndef OPENSSL_SYSNAME_NETWARE --#include <memory.h> -+#include <string.h> - #endif - #include <stdio.h> - --- crypto/jpake/jpake.c.orig 2011-03-08 22:19:36.000000000 +0000 +++ crypto/jpake/jpake.c 2011-03-08 22:19:49.000000000 +0000 @@ -3,7 +3,7 @@ @@ -25,7 +14,7 @@ @@ -57,7 +57,7 @@ #include <openssl/bio.h> - #ifndef OPENSSL_SYSNAME_NETWARE + #if !defined(OPENSSL_SYSNAME_NETWARE) && !defined(OPENSSL_SYSNAME_VXWORKS) -#include <memory.h> +#include <string.h> #endif |