From 91eb92a4236997cefd4fcaf78409a5f70f14fe03 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 22 Jul 2012 23:08:58 +0100 Subject: fix mingw build --- sdk/Makefile | 11 ++++++--- sdk/recipes/patches/libcurl/lib.easy.c.p | 27 ---------------------- .../patches/libcurl/ppc-amigaos/lib.easy.c.p | 27 ++++++++++++++++++++++ .../patches/libcurl/ppc-amigaos/src.main.c.p | 18 +++++++++++++++ sdk/recipes/patches/libcurl/src.main.c.p | 18 --------------- 5 files changed, 53 insertions(+), 48 deletions(-) delete mode 100644 sdk/recipes/patches/libcurl/lib.easy.c.p create mode 100644 sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p create mode 100644 sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p delete mode 100644 sdk/recipes/patches/libcurl/src.main.c.p (limited to 'sdk') diff --git a/sdk/Makefile b/sdk/Makefile index 9551038..6185f48 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -22,7 +22,7 @@ VERSION_LIBJPEG := 8b VERSION_LIBLCMS := 2.1 VERSION_LIBMNG := 1.0.10 VERSION_LIBCARES := 1.9.1 -VERSION_LIBCURL := 7.21.3 +VERSION_LIBCURL := 7.26.0 # Path path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH) @@ -60,18 +60,23 @@ COMMON_SDK_ITEMS := $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libxml2.d $(BUILDSTEPS)/o ifeq ($(TARGET),m68k-atari-mint) EXTRAARGS_LIBXML := --enable-ipv6=no SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(COMMON_SDK_ITEMS) + EXTRAARGS_LIBCARES := --disable-shared endif ifeq ($(TARGET),m68k-unknown-amigaos) SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(BUILDSTEPS)/libtre.d $(COMMON_SDK_ITEMS) + EXTRAARGS_LIBCARES := --disable-shared endif ifeq ($(TARGET),arm-unknown-riscos) SDK_ITEMS := $(COMMON_SDK_ITEMS) + EXTRAARGS_LIBCARES := --disable-shared endif ifeq ($(TARGET),ppc-amigaos) SDK_ITEMS := $(BUILDSTEPS)/libtre.d $(COMMON_SDK_ITEMS) + EXTRAARGS_LIBCARES := --disable-shared + VERSION_LIBCURL := 7.21.3 endif ifeq ($(TARGET),i686-w64-mingw32) @@ -258,7 +263,7 @@ $(BUILDSTEPS)/libcares.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcares-src.d ifneq ($(realpath $(RECIPES)/patches/libcares/$(TARGET)),) for p in `ls $(RECIPES)/patches/libcares/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done endif - cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared + cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) $(EXTRAARGS_LIBCARES) cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(env) make install touch $@ @@ -273,7 +278,7 @@ $(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST 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 - cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-libidn --enable-nonblocking --enable-ares=$(GCCSDK_INSTALL_ENV)/lib --without-random + cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-libidn --enable-nonblocking --enable-ares --without-random cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) make install touch $@ diff --git a/sdk/recipes/patches/libcurl/lib.easy.c.p b/sdk/recipes/patches/libcurl/lib.easy.c.p deleted file mode 100644 index c98b845..0000000 --- a/sdk/recipes/patches/libcurl/lib.easy.c.p +++ /dev/null @@ -1,27 +0,0 @@ ---- lib/easy.c.old 2010-12-29 16:14:23.000000000 +0000 -+++ lib/easy.c 2010-12-29 16:15:10.000000000 +0000 -@@ -263,13 +263,6 @@ - return CURLE_FAILED_INIT; - } - --#ifdef __AMIGA__ -- if(!amiga_init()) { -- DEBUGF(fprintf(stderr, "Error: amiga_init failed\n")); -- return CURLE_FAILED_INIT; -- } --#endif -- - #ifdef NETWARE - if(netware_init()) { - DEBUGF(fprintf(stderr, "Warning: LONG namespace not available\n")); -@@ -358,10 +351,6 @@ - if(init_flags & CURL_GLOBAL_WIN32) - win32_cleanup(); - --#ifdef __AMIGA__ -- amiga_cleanup(); --#endif -- - #if defined(USE_LIBSSH2) && defined(HAVE_LIBSSH2_EXIT) - (void)libssh2_exit(); - #endif diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p new file mode 100644 index 0000000..c98b845 --- /dev/null +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p @@ -0,0 +1,27 @@ +--- lib/easy.c.old 2010-12-29 16:14:23.000000000 +0000 ++++ lib/easy.c 2010-12-29 16:15:10.000000000 +0000 +@@ -263,13 +263,6 @@ + return CURLE_FAILED_INIT; + } + +-#ifdef __AMIGA__ +- if(!amiga_init()) { +- DEBUGF(fprintf(stderr, "Error: amiga_init failed\n")); +- return CURLE_FAILED_INIT; +- } +-#endif +- + #ifdef NETWARE + if(netware_init()) { + DEBUGF(fprintf(stderr, "Warning: LONG namespace not available\n")); +@@ -358,10 +351,6 @@ + if(init_flags & CURL_GLOBAL_WIN32) + win32_cleanup(); + +-#ifdef __AMIGA__ +- amiga_cleanup(); +-#endif +- + #if defined(USE_LIBSSH2) && defined(HAVE_LIBSSH2_EXIT) + (void)libssh2_exit(); + #endif diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p new file mode 100644 index 0000000..846e19c --- /dev/null +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p @@ -0,0 +1,18 @@ +--- src/main.c.old 2010-12-29 16:18:04.000000000 +0000 ++++ src/main.c 2010-12-29 16:17:51.000000000 +0000 +@@ -64,6 +64,15 @@ + #endif + #endif + ++#ifdef __AMIGA__ ++ #ifdef __amigaos4__ ++ #ifndef __USE_INLINE__ ++ #define __USE_INLINE__ ++ #endif ++ #endif ++#include ++#endif ++ + #include "version.h" + + #ifdef HAVE_IO_H /* typical win32 habit */ diff --git a/sdk/recipes/patches/libcurl/src.main.c.p b/sdk/recipes/patches/libcurl/src.main.c.p deleted file mode 100644 index 846e19c..0000000 --- a/sdk/recipes/patches/libcurl/src.main.c.p +++ /dev/null @@ -1,18 +0,0 @@ ---- src/main.c.old 2010-12-29 16:18:04.000000000 +0000 -+++ src/main.c 2010-12-29 16:17:51.000000000 +0000 -@@ -64,6 +64,15 @@ - #endif - #endif - -+#ifdef __AMIGA__ -+ #ifdef __amigaos4__ -+ #ifndef __USE_INLINE__ -+ #define __USE_INLINE__ -+ #endif -+ #endif -+#include -+#endif -+ - #include "version.h" - - #ifdef HAVE_IO_H /* typical win32 habit */ -- cgit v1.2.3