Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/d0eff8ab29085d1623dadd8c3d4ceabf33840702
...commit
http://git.netsurf-browser.org/toolchains.git/commit/d0eff8ab29085d1623dadd8c3d4ceabf33840702
...tree
http://git.netsurf-browser.org/toolchains.git/tree/d0eff8ab29085d1623dadd8c3d4ceabf33840702
The branch, mmu_man/m68k-try-003 has been updated
discards 7c8319def75e027d2ad79eb94244a099fbfe86c4 (commit)
via d0eff8ab29085d1623dadd8c3d4ceabf33840702 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (7c8319def75e027d2ad79eb94244a099fbfe86c4)
\
N -- N -- N (d0eff8ab29085d1623dadd8c3d4ceabf33840702)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=d0eff8ab29085d1623dadd8c3d4ceabf33840702
commit d0eff8ab29085d1623dadd8c3d4ceabf33840702
Author: François Revol <[email protected]>
Commit: François Revol <[email protected]>
m68k-atari-mint: fix OpenSSL build
diff --git a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
new file mode 100644
index 0000000..b5a55dd
--- /dev/null
+++ b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
@@ -0,0 +1,45 @@
+--- /dev/null 2018-06-01 10:46:49.956110101 +0200
++++ Configurations/50-atari.conf 2018-06-03 03:10:55.000000000 +0200
+@@ -0,0 +1,42 @@
++%targets = (
++ "atari-common" => {
++ inherit_from => [ "BASE_unix" ],
++ template => 1,
++ cc => "m68k-atari-mint-gcc",
++ cflags => add_before(picker(default => "-DB_ENDIAN
-DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -Wall",
++ debug => "-g -O0",
++ release => "-O3
-fomit-frame-pointer")),
++ sys_id => "MINT",
++ ranlib => "m68k-atari-mint-ranlib",
++# ? bn_ops => "THIRTY_TWO_BIT BN_LLONG",
++ bn_ops => "BN_LLONG",
++# ex_libs => "-lnetwork",
++# perlasm_scheme => "elf",
++ thread_scheme => "(unknown)",
++# dso_scheme => "dlfcn",
++# shared_target => "gnu-shared",
++# shared_cflag => "-fPIC",
++# shared_ldflag => "-shared",
++# shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++ },
++
++ "m68k-atari-mint000" => {
++ inherit_from => [ "atari-common" ],
++# XXX: does it work on 68000?
++# bn_asm_src => "asm/bn_m68k.s",
++ },
++
++ "m68k-atari-mint" => {
++ inherit_from => [ "atari-common" ],
++ cflags => add(picker(release => "-m68020-60")),
++ bn_asm_src => "asm/bn_m68k.s",
++ },
++
++ "m5475-atari-mint" => {
++ inherit_from => [ "atari-common" ],
++ cc => "m5475-atari-mint-gcc",
++# bn_asm_src => "asm/bn_m68k.s",
++ bn_ops => "BN_LLONG DES_RISC1",
++ ranlib => "m5475-atari-mint-ranlib",
++ },
++);
diff --git a/sdk/recipes/patches/openssl/m5475-atari-mint/crypto.mem_sec.c.p
b/sdk/recipes/patches/openssl/m5475-atari-mint/crypto.mem_sec.c.p
new file mode 100644
index 0000000..5dbd97e
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m5475-atari-mint/crypto.mem_sec.c.p
@@ -0,0 +1,11 @@
+--- crypto/mem_sec.c.orig 2018-06-03 03:52:26.000000000 +0200
++++ crypto/mem_sec.c 2018-06-03 03:53:35.000000000 +0200
+@@ -24,7 +24,7 @@
+
+ #include <string.h>
+
+-#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && !
defined(OPENSSL_SYS_AMIGAOS4) && (defined(OPENSSL_SYS_LINUX) ||
defined(OPENSSL_SYS_UNIX))
++#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && !
defined(OPENSSL_SYS_AMIGAOS4) && !defined(OPENSSL_SYS_MINT) &&
(defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX))
+ # define IMPLEMENTED
+ # include <stdlib.h>
+ # include <assert.h>
diff --git a/sdk/recipes/patches/openssl/m5475-atari-mint/e_os.h.p
b/sdk/recipes/patches/openssl/m5475-atari-mint/e_os.h.p
new file mode 100644
index 0000000..ede1edc
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m5475-atari-mint/e_os.h.p
@@ -0,0 +1,18 @@
+--- e_os.h.orig 2018-06-03 03:19:29.000000000 +0200
++++ e_os.h 2018-06-03 03:19:36.000000000 +0200
+@@ -462,6 +462,15 @@
+ # define OPENSSL_USE_IPV6 0
+ # endif
+ # endif
++/*
++ * We mean it
++ */
++# if (OPENSSL_USE_IPV6 == 0)
++# undef AF_INET6
++# warning undef AF_INET6
++# undef AF_UNIX
++# warning undef AF_UNIX
++# endif
+
+ # endif
+
diff --git
a/sdk/recipes/patches/openssl/m5475-atari-mint/include.openssl.e_os2.h.p
b/sdk/recipes/patches/openssl/m5475-atari-mint/include.openssl.e_os2.h.p
new file mode 100644
index 0000000..8a47b6b
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m5475-atari-mint/include.openssl.e_os2.h.p
@@ -0,0 +1,14 @@
+--- include/openssl/e_os2.h.orig 2018-06-03 03:39:16.000000000 +0200
++++ include/openssl/e_os2.h 2018-06-03 03:43:34.000000000 +0200
+@@ -212,6 +212,11 @@
+ # endif
+ # endif
+
++# ifdef __MINT__
++# define ossl_ssize_t int
++# define OSSL_SSIZE_MAX INT_MAX
++# endif
++
+ # if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t)
+ # define ossl_ssize_t INTN
+ # define OSSL_SSIZE_MAX MAX_INTN
diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.bn.Makefile.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.bn.Makefile.p
deleted file mode 100644
index 8d3bfc6..0000000
--- a/sdk/recipes/patches/openssl/m68k-atari-mint/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-atari-mint/crypto.mem_sec.c.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p
new file mode 100644
index 0000000..5dbd97e
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p
@@ -0,0 +1,11 @@
+--- crypto/mem_sec.c.orig 2018-06-03 03:52:26.000000000 +0200
++++ crypto/mem_sec.c 2018-06-03 03:53:35.000000000 +0200
+@@ -24,7 +24,7 @@
+
+ #include <string.h>
+
+-#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && !
defined(OPENSSL_SYS_AMIGAOS4) && (defined(OPENSSL_SYS_LINUX) ||
defined(OPENSSL_SYS_UNIX))
++#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && !
defined(OPENSSL_SYS_AMIGAOS4) && !defined(OPENSSL_SYS_MINT) &&
(defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX))
+ # define IMPLEMENTED
+ # include <stdlib.h>
+ # include <assert.h>
diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
new file mode 100644
index 0000000..ede1edc
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
@@ -0,0 +1,18 @@
+--- e_os.h.orig 2018-06-03 03:19:29.000000000 +0200
++++ e_os.h 2018-06-03 03:19:36.000000000 +0200
+@@ -462,6 +462,15 @@
+ # define OPENSSL_USE_IPV6 0
+ # endif
+ # endif
++/*
++ * We mean it
++ */
++# if (OPENSSL_USE_IPV6 == 0)
++# undef AF_INET6
++# warning undef AF_INET6
++# undef AF_UNIX
++# warning undef AF_UNIX
++# endif
+
+ # endif
+
diff --git
a/sdk/recipes/patches/openssl/m68k-atari-mint/include.openssl.e_os2.h.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/include.openssl.e_os2.h.p
new file mode 100644
index 0000000..8a47b6b
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-atari-mint/include.openssl.e_os2.h.p
@@ -0,0 +1,14 @@
+--- include/openssl/e_os2.h.orig 2018-06-03 03:39:16.000000000 +0200
++++ include/openssl/e_os2.h 2018-06-03 03:43:34.000000000 +0200
+@@ -212,6 +212,11 @@
+ # endif
+ # endif
+
++# ifdef __MINT__
++# define ossl_ssize_t int
++# define OSSL_SSIZE_MAX INT_MAX
++# endif
++
+ # if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t)
+ # define ossl_ssize_t INTN
+ # define OSSL_SSIZE_MAX MAX_INTN
-----------------------------------------------------------------------
Summary of changes:
sdk/recipes/patches/openssl/Configurations-50-atari.conf.p | 2 +-
.../openssl/{m68k-atari-mint => m5475-atari-mint}/crypto.mem_sec.c.p | 0
.../patches/openssl/{m68k-atari-mint => m5475-atari-mint}/e_os.h.p | 0
.../{m68k-atari-mint => m5475-atari-mint}/include.openssl.e_os2.h.p | 0
4 files changed, 1 insertion(+), 1 deletion(-)
copy sdk/recipes/patches/openssl/{m68k-atari-mint =>
m5475-atari-mint}/crypto.mem_sec.c.p (100%)
copy sdk/recipes/patches/openssl/{m68k-atari-mint =>
m5475-atari-mint}/e_os.h.p (100%)
copy sdk/recipes/patches/openssl/{m68k-atari-mint =>
m5475-atari-mint}/include.openssl.e_os2.h.p (100%)
diff --git a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
index 09c020b..b5a55dd 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
@@ -38,7 +38,7 @@
+ "m5475-atari-mint" => {
+ inherit_from => [ "atari-common" ],
+ cc => "m5475-atari-mint-gcc",
-+ bn_asm_src => "asm/bn_m68k.s",
++# bn_asm_src => "asm/bn_m68k.s",
+ bn_ops => "BN_LLONG DES_RISC1",
+ ranlib => "m5475-atari-mint-ranlib",
+ },
diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p
b/sdk/recipes/patches/openssl/m5475-atari-mint/crypto.mem_sec.c.p
similarity index 100%
copy from sdk/recipes/patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p
copy to sdk/recipes/patches/openssl/m5475-atari-mint/crypto.mem_sec.c.p
diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
b/sdk/recipes/patches/openssl/m5475-atari-mint/e_os.h.p
similarity index 100%
copy from sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
copy to sdk/recipes/patches/openssl/m5475-atari-mint/e_os.h.p
diff --git
a/sdk/recipes/patches/openssl/m68k-atari-mint/include.openssl.e_os2.h.p
b/sdk/recipes/patches/openssl/m5475-atari-mint/include.openssl.e_os2.h.p
similarity index 100%
copy from sdk/recipes/patches/openssl/m68k-atari-mint/include.openssl.e_os2.h.p
copy to sdk/recipes/patches/openssl/m5475-atari-mint/include.openssl.e_os2.h.p
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
