diff options
Diffstat (limited to 'sdk')
| -rw-r--r-- | sdk/Makefile | 19 | ||||
| -rw-r--r-- | sdk/recipes/patches/libcares/ppc-amigaos/configure.p | 11 | ||||
| -rw-r--r-- | sdk/recipes/patches/libcurl/src.main.c.p | 7 | ||||
| -rw-r--r-- | sdk/recipes/patches/liblcms/ppc-amigaos/memory.h.p | 10 | ||||
| -rw-r--r-- | sdk/recipes/patches/libxml2/ppc-amigaos/Makefile.in.p | 14 | ||||
| -rw-r--r-- | sdk/recipes/patches/openssl/Configure.p | 5 | ||||
| -rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p | 33 | ||||
| -rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p | 13 | ||||
| -rw-r--r-- | sdk/recipes/patches/openssl/ppc-amigaos/no-term.p | 24 |
9 files changed, 133 insertions, 3 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index 885c801..780f0d0 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -64,6 +64,10 @@ ifeq ($(TARGET),arm-unknown-riscos) SDK_ITEMS := $(COMMON_SDK_ITEMS) endif +ifeq ($(TARGET),ppc-amigaos) + SDK_ITEMS := $(BUILDSTEPS)/libtre.d $(COMMON_SDK_ITEMS) +endif + ifeq ($(SDK_ITEMS),) $(error Unable to compute SDK components for target $(TARGET)) endif @@ -139,6 +143,10 @@ $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2: $(BUILDSTEPS)/libxml2.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libxml2-src.d mkdir -p $(BUILDDIR)/libxml2 cd $(BUILDDIR)/libxml2 && tar xzf $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz + for p in `ls $(RECIPES)/patches/libxml2/*.p` ; do patch -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done +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) make install touch $@ @@ -154,6 +162,9 @@ $(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST mkdir -p $(BUILDDIR)/openssl cd $(BUILDDIR)/openssl && tar xzf $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz for p in `ls $(RECIPES)/patches/openssl/*.p` ; do patch -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done +ifneq ($(realpath $(RECIPES)/patches/openssl/$(TARGET)),) + for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done +endif cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-asm no-threads cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install touch $@ @@ -197,6 +208,10 @@ $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz: $(BUILDSTEPS)/liblcms.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms-src.d mkdir -p $(BUILDDIR)/liblcms cd $(BUILDDIR)/liblcms && tar xzf $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz + for p in `ls $(RECIPES)/patches/liblcms/*.p` ; do patch -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done +ifneq ($(realpath $(RECIPES)/patches/liblcms/$(TARGET)),) + for p in `ls $(RECIPES)/patches/liblcms/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done +endif cd $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared cd $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) && $(env) make install touch $@ @@ -226,6 +241,10 @@ $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz: $(BUILDSTEPS)/libcares.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcares-src.d mkdir -p $(BUILDDIR)/libcares cd $(BUILDDIR)/libcares && tar xzf $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz + for p in `ls $(RECIPES)/patches/libcares/*.p` ; do patch -d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done +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) make install touch $@ diff --git a/sdk/recipes/patches/libcares/ppc-amigaos/configure.p b/sdk/recipes/patches/libcares/ppc-amigaos/configure.p new file mode 100644 index 0000000..7c7811b --- /dev/null +++ b/sdk/recipes/patches/libcares/ppc-amigaos/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/libcurl/src.main.c.p b/sdk/recipes/patches/libcurl/src.main.c.p index 749fe64..846e19c 100644 --- a/sdk/recipes/patches/libcurl/src.main.c.p +++ b/sdk/recipes/patches/libcurl/src.main.c.p @@ -1,10 +1,15 @@ --- 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,10 @@ +@@ -64,6 +64,15 @@ #endif #endif +#ifdef __AMIGA__ ++ #ifdef __amigaos4__ ++ #ifndef __USE_INLINE__ ++ #define __USE_INLINE__ ++ #endif ++ #endif +#include <proto/dos.h> +#endif + diff --git a/sdk/recipes/patches/liblcms/ppc-amigaos/memory.h.p b/sdk/recipes/patches/liblcms/ppc-amigaos/memory.h.p new file mode 100644 index 0000000..4f44bc2 --- /dev/null +++ b/sdk/recipes/patches/liblcms/ppc-amigaos/memory.h.p @@ -0,0 +1,10 @@ +--- include/lcms2_plugin.h.orig 2011-03-08 22:56:29.000000000 +0000 ++++ include/lcms2_plugin.h 2011-03-08 22:56:44.000000000 +0000 +@@ -50,7 +50,6 @@ + #include <stdlib.h> + #include <math.h> + #include <stdarg.h> +-#include <memory.h> + #include <string.h> + + diff --git a/sdk/recipes/patches/libxml2/ppc-amigaos/Makefile.in.p b/sdk/recipes/patches/libxml2/ppc-amigaos/Makefile.in.p new file mode 100644 index 0000000..cd79fee --- /dev/null +++ b/sdk/recipes/patches/libxml2/ppc-amigaos/Makefile.in.p @@ -0,0 +1,14 @@ +--- Makefile.in.old 2011-03-08 21:57:46.000000000 +0000 ++++ Makefile.in 2011-03-08 21:58:04.000000000 +0000 +@@ -41,9 +41,9 @@ + testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \ + testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \ + testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \ +- testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \ ++ testapi$(EXEEXT) testModule$(EXEEXT) \ + runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \ +- runxmlconf$(EXEEXT) testrecurse$(EXEEXT) ++ runxmlconf$(EXEEXT) + bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT) + subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index 156a589..e2fad67 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -1,16 +1,17 @@ --- Configure.old 2010-12-29 02:43:14.000000000 +0000 +++ Configure 2010-12-29 02:45:29.000000000 +0000 -@@ -412,6 +412,9 @@ +@@ -412,6 +412,10 @@ "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-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", + #### SCO/Caldera targets. # # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. -@@ -1039,6 +1042,7 @@ +@@ -1039,6 +1043,7 @@ my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p new file mode 100644 index 0000000..38232d1 --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p @@ -0,0 +1,33 @@ +--- 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 @@ + #include <openssl/crypto.h> + #include <openssl/sha.h> + #include <openssl/err.h> +-#include <memory.h> ++#include <string.h> + + /* + * In the definition, (xa, xb, xc, xd) are Alice's (x1, x2, x3, x4) or +--- crypto/pkcs7/bio_pk7.c.orig 2011-03-08 22:21:16.000000000 +0000 ++++ crypto/pkcs7/bio_pk7.c 2011-03-08 22:21:23.000000000 +0000 +@@ -57,7 +57,7 @@ + #include <openssl/bio.h> + + #ifndef OPENSSL_SYSNAME_NETWARE +-#include <memory.h> ++#include <string.h> + #endif + #include <stdio.h> + diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p b/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p new file mode 100644 index 0000000..1b7fa9e --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p @@ -0,0 +1,13 @@ +--- apps/speed.c.orig 2011-03-08 22:44:56.000000000 +0000 ++++ apps/speed.c 2011-03-08 22:48:10.000000000 +0000 +@@ -198,6 +198,10 @@ + #define NO_FORK + #endif + ++#ifdef OPENSSL_SYS_AMIGAOS4 ++#undef SIGALRM ++#endif ++ + #undef BUFSIZE + #define BUFSIZE ((long)1024*8+1) + int run=0; diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p b/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p new file mode 100644 index 0000000..097bbb4 --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p @@ -0,0 +1,24 @@ +--- crypto/ui/ui_openssl.c.orig 2011-03-08 22:37:51.000000000 +0000 ++++ crypto/ui/ui_openssl.c 2011-03-08 22:39:00.000000000 +0000 +@@ -214,6 +214,12 @@ + #undef SGTTY + #endif + ++#if defined(OPENSSL_SYS_AMIGAOS4) ++#undef TERMIOS ++#undef TERMIO ++#undef SGTTY ++#endif ++ + #ifdef TERMIOS + # include <termios.h> + # define TTY_STRUCT struct termios +@@ -262,7 +268,7 @@ + typedef int sig_atomic_t; + #endif + +-#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) ++#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_AMIGAOS4) + /* + * This one needs work. As a matter of fact the code is unoperational + * and this is only a trick to get it compiled. |