summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sdk/Makefile6
-rw-r--r--sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p13
2 files changed, 17 insertions, 2 deletions
diff --git a/sdk/Makefile b/sdk/Makefile
index be4d3a3..573aed1 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -130,6 +130,8 @@ ifeq ($(TARGET),m68k-unknown-amigaos)
EXTRAARGS_LIBCARES := --disable-shared --without-random
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
+ LIBJPEG_ENV := LDFLAGS="-lm"
+ LIBCURL_ENV := LDFLAGS="-lm"
endif
ifeq ($(SDK_ITEMS),)
@@ -368,7 +370,7 @@ $(BUILDSTEPS)/libjpeg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libjpeg-src.d
mkdir -p $(BUILDDIR)/libjpeg
cd $(BUILDDIR)/libjpeg && tar xaf $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz
for p in `ls $(RECIPES)/patches/libjpeg/*.p` ; do $(PATCH) -d $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) -p0 <$$p ; done
- cd $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
+ cd $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) && $(env) $(LIBJPEG_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) && $(env) make install
touch $@
@@ -399,7 +401,7 @@ $(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) CFLAGS="" $(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 $@
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p
new file mode 100644
index 0000000..7de5cba
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p
@@ -0,0 +1,13 @@
+--- ./tool_getpass.c 2014-06-11 18:52:29.000000000 +0100
++++ src/tool_getpass.c 2015-01-05 21:42:31.826011647 +0000
+@@ -24,6 +24,10 @@
+ #ifndef HAVE_GETPASS_R
+ /* this file is only for systems without getpass_r() */
+
++#ifdef __AMIGA__
++#undef HAVE_TERMIOS_H
++#endif
++
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif