Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/97fb68ef4f1cbe3850... ...commit http://git.netsurf-browser.org/toolchains.git/commit/97fb68ef4f1cbe3850ff... ...tree http://git.netsurf-browser.org/toolchains.git/tree/97fb68ef4f1cbe3850ff11... The branch, chris/openssl11 has been created at 97fb68ef4f1cbe3850ff11a118f5b0a9868e0af2 (commit) - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=97fb68ef4f1cbe38... commit 97fb68ef4f1cbe3850ff11a118f5b0a9868e0af2 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Broken amigaos3 build of openssl1.1, but slightly less broken than in master diff --git a/sdk/recipes/files/openssl/m68k-unknown-amigaos/Configurations/50-amigaos3.conf b/sdk/recipes/files/openssl/m68k-unknown-amigaos/Configurations/50-amigaos3.conf new file mode 100644 index 0000000..fa6d70c --- /dev/null +++ b/sdk/recipes/files/openssl/m68k-unknown-amigaos/Configurations/50-amigaos3.conf @@ -0,0 +1,19 @@ +%targets = ( + + "m68k-unknown-amigaos" => { + cc => "m68k-unknown-amigaos-gcc", + ranlib => "m68k-unknown-amigaos-ranlib", + cflags => picker(default => "-DB_ENDIAN -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -m68020 -O3 -fomit-frame-pointer -Wall -DLLONG_MAX=0x7fffffffffffffffLL -DLLONG_MIN=-0x7fffffffffffffffLL-1", + debug => "-O0 -g -gstabs -DBN_DEBUG -DCONF_DEBUG -DDEBUG", + release => "-O3 -DNDEBUG", + threads("-D_REENTRANT")), + lib_cflags => "-resident32 -DAMISSL_COMPILE -I../../libcmt", + bin_cflags => "-I../../openssl", + thread_cflag => "(unknown)", + sys_id => "AMIGAOS3", + bn_ops => "THIRTY_TWO_BIT BN_LLONG", + bn_asm_src => "asm/bn_m68k.s", + ex_libs => add('-lnet -lm'), + }, +); + diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.bio_lcl.h.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.bio_lcl.h.p new file mode 100644 index 0000000..9c34a56 --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.bio_lcl.h.p @@ -0,0 +1,11 @@ +--- crypto/bio/bio_lcl.h 2017-11-15 00:15:04.097008525 +0000 ++++ crypto/bio/bio_lcl.h 2017-11-15 00:21:42.461007363 +0000 +@@ -36,7 +36,7 @@ + /* + * Undefine AF_UNIX on systems that define it but don't support it. + */ +-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_RISCOS) ++# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_RISCOS) || defined(OPENSSL_SYS_AMIGAOS3) + # undef AF_UNIX + # endif + diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p deleted file mode 100644 index 8d3bfc6..0000000 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p +++ /dev/null @@ -1,12 +0,0 @@ ---- crypto/bn/Makefile 2017-01-26 13:22:03.000000000 +0000 -+++ crypto/bn/Makefile 2017-02-11 15:24:31.133017711 +0000 -@@ -60,6 +60,9 @@ lib: $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -+bn_m68k.o: asm/bn_m68k.s -+ $(CC) $(CFLAGS) -c -o $@ asm/bn_m68k.s -+ - bn-586.s: asm/bn-586.pl ../perlasm/x86asm.pl - $(PERL) asm/bn-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - co-586.s: asm/co-586.pl ../perlasm/x86asm.pl diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.Makefile.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.Makefile.p deleted file mode 100644 index 623f599..0000000 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.Makefile.p +++ /dev/null @@ -1,14 +0,0 @@ ---- crypto/rand/Makefile 2017-03-29 18:44:57.752006689 +0100 -+++ crypto/rand/Makefile 2017-03-29 18:45:23.976006610 +0100 -@@ -18,9 +18,9 @@ APPS= - - LIB=$(TOP)/libcrypto.a - LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ -- rand_win.c rand_unix.c rand_os2.c rand_nw.c -+ rand_win.c rand_unix.c rand_os2.c rand_nw.c rand_amiga.c - LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \ -- rand_win.o rand_unix.o rand_os2.o rand_nw.o -+ rand_win.o rand_unix.o rand_os2.o rand_nw.o rand_amiga.o - - SRC= $(LIBSRC) - diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.rand_unix.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.rand_unix.c.p index 2caae57..67a3bcc 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.rand_unix.c.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.rand_unix.c.p @@ -1,11 +1,11 @@ ---- crypto/rand/rand_unix.c 2017-01-26 13:22:03.000000000 +0000 -+++ crypto/rand/rand_unix.c 2017-03-29 17:42:59.932017575 +0100 -@@ -116,7 +116,7 @@ +--- crypto/rand/rand_unix.c 2017-05-25 13:46:19.000000000 +0100 ++++ crypto/rand/rand_unix.c 2017-11-14 23:40:40.713014568 +0000 +@@ -15,7 +15,7 @@ #include <openssl/rand.h> #include "rand_lcl.h" --#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE)) -+#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_AMIGAOS4) || defined(OPENSSL_SYS_AMIGAOS3)) +-#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)) ++#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI) || defined(OPENSSL_SYS_AMIGAOS3)) # include <sys/types.h> # include <sys/time.h> diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p index 890cef3..e2bc3e0 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p @@ -1,6 +1,6 @@ ---- 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 -@@ -218,6 +218,12 @@ +--- crypto/ui/ui_openssl.c 2017-05-25 13:46:19.000000000 +0100 ++++ crypto/ui/ui_openssl.c 2017-11-14 23:37:52.705015059 +0000 +@@ -99,6 +99,12 @@ #endif @@ -13,12 +13,3 @@ #ifdef TERMIOS # include <termios.h> # define TTY_STRUCT struct termios -@@ -266,7 +272,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_AMIGAOS3) - /* - * This one needs work. As a matter of fact the code is unoperational - * and this is only a trick to get it compiled. ----------------------------------------------------------------------- -- Cross-compilation toolchains and environments