From 7ffc6514610176a548f286a62f2806f3b6d88d84 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 16 Oct 2014 15:13:42 +0100 Subject: update atari toolchain build to work again --- sdk/Makefile | 4 +++- .../patches/libcurl/m5475-atari-mint/lib.asyn-ares.c.p | 11 ----------- sdk/recipes/patches/libcurl/m68k-atari-mint/lib.asyn-ares.c.p | 11 ----------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 sdk/recipes/patches/libcurl/m5475-atari-mint/lib.asyn-ares.c.p delete mode 100644 sdk/recipes/patches/libcurl/m68k-atari-mint/lib.asyn-ares.c.p (limited to 'sdk') diff --git a/sdk/Makefile b/sdk/Makefile index 29507b6..b023dab 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -102,6 +102,7 @@ ifeq ($(TARGET),m68k-atari-mint) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver EXTRAARGS_LIBICONV := --enable-extra-encodings + LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" endif ifeq ($(TARGET),m5475-atari-mint) @@ -109,6 +110,7 @@ ifeq ($(TARGET),m5475-atari-mint) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver EXTRAARGS_LIBICONV := --enable-extra-encodings + LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" endif ifeq ($(TARGET),ppc-amigaos) @@ -177,7 +179,7 @@ $(BUILDSTEPS)/libiconv.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libiconv-src.d ifneq ($(realpath $(RECIPES)/patches/libiconv/$(TARGET)),) for p in `ls $(RECIPES)/patches/libiconv/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) -p0 <$$p ; done endif - cd $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared $(EXTRAARGS_LIBICONV) + cd $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) && $(env) $(LIBICONV_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared $(EXTRAARGS_LIBICONV) cd $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) && $(env) make install touch $@ diff --git a/sdk/recipes/patches/libcurl/m5475-atari-mint/lib.asyn-ares.c.p b/sdk/recipes/patches/libcurl/m5475-atari-mint/lib.asyn-ares.c.p deleted file mode 100644 index 8a8e3ab..0000000 --- a/sdk/recipes/patches/libcurl/m5475-atari-mint/lib.asyn-ares.c.p +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/asyn-ares.c 2012-10-19 21:37:45.000000000 +0100 -+++ lib/asyn-ares.c 2012-10-19 21:38:09.000000000 +0100 -@@ -669,7 +669,7 @@ - CURLcode Curl_set_dns_local_ip6(struct SessionHandle *data, - const char *local_ip6) - { --#if (ARES_VERSION >= 0x010704) -+#if (ARES_VERSION >= 0x010704) && defined(ENABLE_IPV6) - unsigned char a6[INET6_ADDRSTRLEN]; - - if((!local_ip6) || (local_ip6[0] == 0)) { diff --git a/sdk/recipes/patches/libcurl/m68k-atari-mint/lib.asyn-ares.c.p b/sdk/recipes/patches/libcurl/m68k-atari-mint/lib.asyn-ares.c.p deleted file mode 100644 index 8a8e3ab..0000000 --- a/sdk/recipes/patches/libcurl/m68k-atari-mint/lib.asyn-ares.c.p +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/asyn-ares.c 2012-10-19 21:37:45.000000000 +0100 -+++ lib/asyn-ares.c 2012-10-19 21:38:09.000000000 +0100 -@@ -669,7 +669,7 @@ - CURLcode Curl_set_dns_local_ip6(struct SessionHandle *data, - const char *local_ip6) - { --#if (ARES_VERSION >= 0x010704) -+#if (ARES_VERSION >= 0x010704) && defined(ENABLE_IPV6) - unsigned char a6[INET6_ADDRSTRLEN]; - - if((!local_ip6) || (local_ip6[0] == 0)) { -- cgit v1.2.3