diff options
-rw-r--r-- | sdk/Makefile | 10 | ||||
-rw-r--r-- | sdk/recipes/patches/libcares/m68k-atari-mint/configure.p | 11 | ||||
-rw-r--r-- | sdk/recipes/patches/liblcms/m68k-atari-mint/sqrtf.p | 13 | ||||
-rw-r--r-- | sdk/recipes/patches/libpng/m68k-atari-mint/longjmp.p | 11 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/Configure.p | 3 |
5 files changed, 46 insertions, 2 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index 780f0d0..776c322 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -56,6 +56,11 @@ COMMON_SDK_ITEMS := $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libxml2.d $(BUILDSTEPS)/o $(BUILDSTEPS)/libpng.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms.d \ $(BUILDSTEPS)/libmng.d $(BUILDSTEPS)/libcares.d $(BUILDSTEPS)/libcurl.d +ifeq ($(TARGET),m68k-atari-mint) + EXTRAARGS_LIBXML := --enable-ipv6=no + SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(COMMON_SDK_ITEMS) +endif + ifeq ($(TARGET),m68k-unknown-amigaos) SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(BUILDSTEPS)/libtre.d $(COMMON_SDK_ITEMS) endif @@ -147,7 +152,7 @@ $(BUILDSTEPS)/libxml2.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST ifneq ($(realpath $(RECIPES)/patches/libxml2/$(TARGET)),) for p in `ls $(RECIPES)/patches/libxml2/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done endif - cd $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared + cd $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared $(EXTRAARGS_LIBXML) cd $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) && $(env) make install touch $@ @@ -179,6 +184,9 @@ $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz: $(BUILDSTEPS)/libpng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libpng-src.d mkdir -p $(BUILDDIR)/libpng cd $(BUILDDIR)/libpng && tar xzf $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz +ifneq ($(realpath $(RECIPES)/patches/libpng/$(TARGET)),) + for p in `ls $(RECIPES)/patches/libpng/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libpng/libpng-$(VERSION_LIBPNG) -p0 <$$p ; done +endif cd $(BUILDDIR)/libpng/libpng-$(VERSION_LIBPNG) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared cd $(BUILDDIR)/libpng/libpng-$(VERSION_LIBPNG) && $(env) make install touch $@ diff --git a/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p b/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p new file mode 100644 index 0000000..7c7811b --- /dev/null +++ b/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p @@ -0,0 +1,11 @@ +--- configure.orig 2011-03-08 23:18:37.000000000 +0000 ++++ configure 2011-03-08 23:18:59.000000000 +0000 +@@ -16806,8 +16806,6 @@ + stdbool.h \ + time.h \ + limits.h \ +- arpa/nameser.h \ +- arpa/nameser_compat.h \ + arpa/inet.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/sdk/recipes/patches/liblcms/m68k-atari-mint/sqrtf.p b/sdk/recipes/patches/liblcms/m68k-atari-mint/sqrtf.p new file mode 100644 index 0000000..dad4aa8 --- /dev/null +++ b/sdk/recipes/patches/liblcms/m68k-atari-mint/sqrtf.p @@ -0,0 +1,13 @@ +--- src/lcms2_internal.h 2010-11-29 16:11:49.000000000 +0000 ++++ src/lcms2_internal.h 2011-05-14 02:22:34.000000000 +0100 +@@ -52,6 +52,10 @@ + #define sqrtf(x) (float)sqrt((float)x) + #endif + ++// MiNTLib omits sqrtf ++#ifdef __MINT__ ++#define sqrtf(x) (float)sqrt((float)x) ++#endif + + // Alignment of ICC file format uses 4 bytes (cmsUInt32Number) + #define _cmsSIZEOFLONGMINUS1 (sizeof(cmsUInt32Number)-1) diff --git a/sdk/recipes/patches/libpng/m68k-atari-mint/longjmp.p b/sdk/recipes/patches/libpng/m68k-atari-mint/longjmp.p new file mode 100644 index 0000000..9939be7 --- /dev/null +++ b/sdk/recipes/patches/libpng/m68k-atari-mint/longjmp.p @@ -0,0 +1,11 @@ +--- png.h 2010-12-09 13:48:10.000000000 +0000 ++++ png.h 2011-05-14 02:12:40.000000000 +0100 +@@ -1545,7 +1545,7 @@ + PNGARG((png_structp png_ptr, png_longjmp_ptr longjmp_fn, size_t + jmp_buf_size)); + # define png_jmpbuf(png_ptr) \ +- (*png_set_longjmp_fn((png_ptr), longjmp, sizeof (jmp_buf))) ++ (*png_set_longjmp_fn((png_ptr), siglongjmp, sizeof (jmp_buf))) + #else + # define png_jmpbuf(png_ptr) \ + (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP) diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index e2fad67..314059f 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -1,10 +1,11 @@ --- Configure.old 2010-12-29 02:43:14.000000000 +0000 +++ Configure 2010-12-29 02:45:29.000000000 +0000 -@@ -412,6 +412,10 @@ +@@ -412,6 +412,11 @@ "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", +"arm-unknown-riscos","arm-unknown-riscos-gcc:-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::echo", ++"m68k-atari-mint","m68k-atari-mint-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m68k-atari-mint-ranlib", +"m68k-unknown-amigaos","m68k-unknown-amigaos-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m68k-unknown-amigaos-ranlib", +"ppc-amigaos","ppc-amigaos-gcc:-DB_ENDIAN -DOPENSSL_SYS_AMIGAOS4 -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::ppc-amigaos-ranlib", + |