Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/7a20aaf7ef829cbc3abed47d20852b3112678523
...commit
http://git.netsurf-browser.org/toolchains.git/commit/7a20aaf7ef829cbc3abed47d20852b3112678523
...tree
http://git.netsurf-browser.org/toolchains.git/tree/7a20aaf7ef829cbc3abed47d20852b3112678523
The branch, master has been updated
via 7a20aaf7ef829cbc3abed47d20852b3112678523 (commit)
via 64f29186b42ec744359c466e7393190599749de5 (commit)
via f54663002db335976141777c3096e70992f81fdc (commit)
via d36a8f48290c2665d7370d8d265adbbf8677eaba (commit)
via 10c6bebb9002a17f063868437042812d69dbe521 (commit)
via 4e9320eb523ffbea3896d926d8b6de270658d9a4 (commit)
via 7e9e3326cf4483fdc82ff78f829da42aed075678 (commit)
via 90717ccbcf3bc05677309115abaeef004356747d (commit)
via 19fef6facae17a73f6549533266f445273b8a702 (commit)
via 92a826bc60cefa6b9b222381d724340ecf615f97 (commit)
via 95a9aa06c85692f643e597cfc5c9ca21e273e2ae (commit)
via 8c92676e7ce1620309cfbb64b81266ec1ceae637 (commit)
from f2b2d9c670d55f1879948d97ca18fe087b724333 (commit)
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=7a20aaf7ef829cbc3abed47d20852b3112678523
commit 7a20aaf7ef829cbc3abed47d20852b3112678523
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove redundant patch from m5475-atari-mint crypto build
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
deleted file mode 100644
index 5dbd97e..0000000
--- a/sdk/recipes/patches/openssl/m5475-atari-mint/crypto.mem_sec.c.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=64f29186b42ec744359c466e7393190599749de5
commit 64f29186b42ec744359c466e7393190599749de5
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
update m68k atari sdk patches
diff --git a/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
b/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
new file mode 100644
index 0000000..271d571
--- /dev/null
+++ b/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
@@ -0,0 +1,16 @@
+--- crypto/mem_sec.c.orig 2019-02-13 14:25:17.725058588 +0000
++++ crypto/mem_sec.c 2019-02-13 14:35:39.790029062 +0000
+@@ -25,7 +25,12 @@
+ #include <string.h>
+
+ /* e_os.h includes unistd.h, which defines _POSIX_VERSION */
+-#if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \
++#if !defined(OPENSSL_NO_SECURE_MEMORY) \
++ && !defined(OPENSSL_SYS_RISCOS) \
++ && !defined(OPENSSL_SYS_AMIGAOS3) \
++ && !defined(OPENSSL_SYS_AMIGAOS4) \
++ && !defined(OPENSSL_SYS_MINT) \
++ && defined(OPENSSL_SYS_UNIX) \
+ && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
+ || defined(__sun) || defined(__hpux) || defined(__sgi) \
+ || defined(__osf__) )
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
deleted file mode 100644
index 5dbd97e..0000000
--- a/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.mem_sec.c.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/mem_sec.c.p
b/sdk/recipes/patches/openssl/mem_sec.c.p
deleted file mode 100644
index e209f75..0000000
--- a/sdk/recipes/patches/openssl/mem_sec.c.p
+++ /dev/null
@@ -1,15 +0,0 @@
---- crypto/mem_sec.c.orig 2019-02-13 14:25:17.725058588 +0000
-+++ crypto/mem_sec.c 2019-02-13 14:35:39.790029062 +0000
-@@ -25,7 +25,11 @@
- #include <string.h>
-
- /* e_os.h includes unistd.h, which defines _POSIX_VERSION */
--#if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \
-+#if !defined(OPENSSL_NO_SECURE_MEMORY) \
-+ && !defined(OPENSSL_SYS_RISCOS) \
-+ && !defined(OPENSSL_SYS_AMIGAOS3) \
-+ && !defined(OPENSSL_SYS_AMIGAOS4) \
-+ && defined(OPENSSL_SYS_UNIX) \
- && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
- || defined(__sun) || defined(__hpux) || defined(__sgi) \
- || defined(__osf__) )
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=f54663002db335976141777c3096e70992f81fdc
commit f54663002db335976141777c3096e70992f81fdc
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[email protected]>
m5475-atari-mint: hack until mintbin install path is fixed
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index 64c1b6e..a59c304 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -191,7 +191,9 @@ $(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d
cd $(BUILDDIR)/mintbin && $(MINTBIN_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
cd $(BUILDDIR)/mintbin && make
cd $(BUILDDIR)/mintbin && make install
- mv $(PREFIX)/$(TARGET_NAME)/bin/$(TARGET_NAME)-* $(PREFIX)/bin/
+ #mv $(PREFIX)/{$(TARGET_NAME)/bin/$(TARGET_NAME)-* $(PREFIX)/bin/
+ #HACK: mintbin install traget looks broken
+ mv $(PREFIX)/*-atari-mint/bin/$(TARGET_NAME)-* $(PREFIX)/bin/
touch $@
$(BUILDSTEPS)/mintbin-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL)
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=d36a8f48290c2665d7370d8d265adbbf8677eaba
commit d36a8f48290c2665d7370d8d265adbbf8677eaba
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[email protected]>
atari-mint: update binutils to 2.30
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index d418c38..64c1b6e 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -8,10 +8,10 @@ UPSTREAM_GCC_URI :=
http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPS
UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2
UPSTREAM_GCC_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GCC_PATCH)
-UPSTREAM_BINUTILS_VERSION := 2.28
+UPSTREAM_BINUTILS_VERSION := 2.30
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2
UPSTREAM_BINUTILS_URI :=
ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL)
-UPSTREAM_BINUTILS_PATCH := binutils-2.28-mint-20170531.patch.bz2
+UPSTREAM_BINUTILS_PATCH := binutils-2.30-mint-20180703.patch.bz2
UPSTREAM_BINUTILS_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_BINUTILS_PATCH)
UPSTREAM_GMP_VERSION := 4.3.2
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index 4e4623d..053a6ad 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -8,10 +8,10 @@ UPSTREAM_GCC_URI :=
http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPS
UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2
UPSTREAM_GCC_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GCC_PATCH)
-UPSTREAM_BINUTILS_VERSION := 2.28
+UPSTREAM_BINUTILS_VERSION := 2.30
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2
UPSTREAM_BINUTILS_URI :=
ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL)
-UPSTREAM_BINUTILS_PATCH := binutils-2.28-mint-20170531.patch.bz2
+UPSTREAM_BINUTILS_PATCH := binutils-2.30-mint-20180703.patch.bz2
UPSTREAM_BINUTILS_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_BINUTILS_PATCH)
UPSTREAM_GMP_VERSION := 4.3.2
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=10c6bebb9002a17f063868437042812d69dbe521
commit 10c6bebb9002a17f063868437042812d69dbe521
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[email protected]>
atari-mint: fix mintbin install path
Not that NS really needs it (we pass the stack size to the linker),
but other progs using the SDK might.
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index 4a05c25..d418c38 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -191,6 +191,7 @@ $(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d
cd $(BUILDDIR)/mintbin && $(MINTBIN_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
cd $(BUILDDIR)/mintbin && make
cd $(BUILDDIR)/mintbin && make install
+ mv $(PREFIX)/$(TARGET_NAME)/bin/$(TARGET_NAME)-* $(PREFIX)/bin/
touch $@
$(BUILDSTEPS)/mintbin-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL)
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index 8f1cec8..4e4623d 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -190,6 +190,7 @@ $(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d
cd $(BUILDDIR)/mintbin && $(MINTBIN_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
cd $(BUILDDIR)/mintbin && make
cd $(BUILDDIR)/mintbin && make install
+ mv $(PREFIX)/$(TARGET_NAME)/bin/$(TARGET_NAME)-* $(PREFIX)/bin/
touch $@
$(BUILDSTEPS)/mintbin-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL)
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=4e9320eb523ffbea3896d926d8b6de270658d9a4
commit 4e9320eb523ffbea3896d926d8b6de270658d9a4
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[email protected]>
atari-mint: fix typo (BINUTILS vs MINTBIN)
No wonder mintbin wasn't installed at all...
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index 54d9a57..4a05c25 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -188,7 +188,7 @@ $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d:
$(BUILDSTEPS)/buildsteps.d $(SOURCESDIR
$(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d
mkdir -p $(BUILDDIR)/mintbin
- cd $(BUILDDIR)/mintbin && $(BINUTILS_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
+ cd $(BUILDDIR)/mintbin && $(MINTBIN_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
cd $(BUILDDIR)/mintbin && make
cd $(BUILDDIR)/mintbin && make install
touch $@
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index 68fdd03..8f1cec8 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -187,7 +187,7 @@ $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d:
$(BUILDSTEPS)/buildsteps.d $(SOURCESDIR
$(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d
mkdir -p $(BUILDDIR)/mintbin
- cd $(BUILDDIR)/mintbin && $(BINUTILS_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
+ cd $(BUILDDIR)/mintbin && $(MINTBIN_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
cd $(BUILDDIR)/mintbin && make
cd $(BUILDDIR)/mintbin && make install
touch $@
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=7e9e3326cf4483fdc82ff78f829da42aed075678
commit 7e9e3326cf4483fdc82ff78f829da42aed075678
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[email protected]>
m5475-atari-mint: update mintlib on par with m68k
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index cc6543c..54d9a57 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -31,7 +31,7 @@ UPSTREAM_MINTBIN_VERSION := CVS-20110527
UPSTREAM_MINTBIN_TARBALL := mintbin-$(UPSTREAM_MINTBIN_VERSION).tar.gz
UPSTREAM_MINTBIN_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTBIN_TARBALL)
-UPSTREAM_MINTLIB_VERSION := CVS-20131219
+UPSTREAM_MINTLIB_VERSION := Git-20170304
UPSTREAM_MINTLIB_TARBALL := mintlib-$(UPSTREAM_MINTLIB_VERSION).tar.gz
UPSTREAM_MINTLIB_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTLIB_TARBALL)
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=90717ccbcf3bc05677309115abaeef004356747d
commit 90717ccbcf3bc05677309115abaeef004356747d
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[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
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=19fef6facae17a73f6549533266f445273b8a702
commit 19fef6facae17a73f6549533266f445273b8a702
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[email protected]>
atari-mint: allow parallel build of binutils and gcc
by passing BUILD_SMP=-jN to make
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index a7b0df1..cc6543c 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -62,6 +62,8 @@ SRCDIR := $(BUILDDIR)/srcdir
GCC_SRCDIR := $(SRCDIR)/gcc
BINUTILS_SRCDIR := $(SRCDIR)/binutils
MINTBIN_SRCDIR := $(SRCDIR)/mintbin
+# optionally pass -jN here
+BUILD_SMP :=
TARGET_NAME := m5475-atari-mint
@@ -143,9 +145,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d:
$(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
--enable-checking=no --enable-c99 \
--enable-maintainer-mode --without-headers \
--with-arch=cf
- cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-gcc
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc
- cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-target-libgcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-target-libgcc
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-target-libgcc
touch $@
@@ -203,7 +205,7 @@ $(BUILDSTEPS)/mintbin-srcdir.d:
$(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL)
$(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d
mkdir -p $(BUILDDIR)/binutils
cd $(BUILDDIR)/binutils && $(BINUTILS_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
- cd $(BUILDDIR)/binutils && make
+ cd $(BUILDDIR)/binutils && make $(BUILD_SMP)
cd $(BUILDDIR)/binutils && make install
touch $@
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index 8c05e5b..68fdd03 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -62,6 +62,8 @@ SRCDIR := $(BUILDDIR)/srcdir
GCC_SRCDIR := $(SRCDIR)/gcc
BINUTILS_SRCDIR := $(SRCDIR)/binutils
MINTBIN_SRCDIR := $(SRCDIR)/mintbin
+# optionally pass -jN here
+BUILD_SMP :=
TARGET_NAME := m68k-atari-mint
@@ -142,9 +144,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d:
$(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
--disable-nls --enable-languages=c \
--enable-checking=no --enable-c99 \
--enable-maintainer-mode --without-headers
- cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-gcc
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc
- cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-target-libgcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-target-libgcc
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-target-libgcc
touch $@
@@ -202,7 +204,7 @@ $(BUILDSTEPS)/mintbin-srcdir.d:
$(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL)
$(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d
mkdir -p $(BUILDDIR)/binutils
cd $(BUILDDIR)/binutils && $(BINUTILS_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
- cd $(BUILDDIR)/binutils && make
+ cd $(BUILDDIR)/binutils && make $(BUILD_SMP)
cd $(BUILDDIR)/binutils && make install
touch $@
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=92a826bc60cefa6b9b222381d724340ecf615f97
commit 92a826bc60cefa6b9b222381d724340ecf615f97
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[email protected]>
atari-mint: completely skip using makeinfo
Fixes "no matching `@end tex'" errors triggered with recent makeinfo.
Who needs documentation anyway.
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index 0c01623..a7b0df1 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -51,6 +51,7 @@ GCC_AUTORECONF := autoreconf2.64
GCC_AUTOM4TE := autom4te2.64
GCC_AUTOMAKE := automake-1.11
GCC_ACLOCAL := aclocal-1.11
+GCC_MAKEINFO := :
TOP := $(CURDIR)
RECIPES := $(TOP)/recipes
@@ -133,7 +134,7 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d
$(SOURCESDIR)/$(UPST
# Rules to build and install the bootstrap compiler
###
-GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE)
PATH="$(PREFIX)/bin:$(PATH)"
+GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE)
MAKEINFO=$(GCC_MAKEINFO) PATH="$(PREFIX)/bin:$(PATH)"
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index bd43f2c..8c05e5b 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -51,6 +51,7 @@ GCC_AUTORECONF := autoreconf2.64
GCC_AUTOM4TE := autom4te2.64
GCC_AUTOMAKE := automake-1.11
GCC_ACLOCAL := aclocal-1.11
+GCC_MAKEINFO := :
TOP := $(CURDIR)
RECIPES := $(TOP)/recipes
@@ -133,7 +134,7 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d
$(SOURCESDIR)/$(UPST
# Rules to build and install the bootstrap compiler
###
-GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE)
PATH="$(PREFIX)/bin:$(PATH)"
+GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE)
MAKEINFO=$(GCC_MAKEINFO) PATH="$(PREFIX)/bin:$(PATH)"
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=95a9aa06c85692f643e597cfc5c9ca21e273e2ae
commit 95a9aa06c85692f643e597cfc5c9ca21e273e2ae
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[email protected]>
atari-mint: Force automake/aclocal to 1.11
Since we force autoconf and friends to 2.64, on Debian unstable
at leastsome aclocal macros complain that they require at least 2.65.
Also add automake1.11 to the list of required debian packages.
diff --git a/README b/README
index 237dbb3..4c8797c 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ Pre-requisites for Debian systems
$ apt-get install build-essential autoconf automake autogen flex bison
$ apt-get install libtool texinfo help2man subversion cvs git
- $ apt-get install lhasa unzip autoconf2.64
+ $ apt-get install lhasa unzip autoconf2.64 automake1.11
On multiarch-aware systems:
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index 0e98c1d..0c01623 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -49,6 +49,8 @@ GCC_AUTOCONF := autoconf2.64
GCC_AUTOHEADER := autoheader2.64
GCC_AUTORECONF := autoreconf2.64
GCC_AUTOM4TE := autom4te2.64
+GCC_AUTOMAKE := automake-1.11
+GCC_ACLOCAL := aclocal-1.11
TOP := $(CURDIR)
RECIPES := $(TOP)/recipes
@@ -131,7 +133,7 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d
$(SOURCESDIR)/$(UPST
# Rules to build and install the bootstrap compiler
###
-GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)"
+GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE)
PATH="$(PREFIX)/bin:$(PATH)"
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \
@@ -154,9 +156,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d:
$(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
$(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d
$(SOURCESDIR)/$(UPSTREAM_GCC_PATCH)
bzcat $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) | patch -d $(GCC_SRCDIR) -p1
cd $(GCC_SRCDIR) && ./contrib/gcc_update --touch
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath
for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR)
-p0 <$$p ; done
touch $@
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index 8b3800d..bd43f2c 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -49,6 +49,8 @@ GCC_AUTOCONF := autoconf2.64
GCC_AUTOHEADER := autoheader2.64
GCC_AUTORECONF := autoreconf2.64
GCC_AUTOM4TE := autom4te2.64
+GCC_AUTOMAKE := automake-1.11
+GCC_ACLOCAL := aclocal-1.11
TOP := $(CURDIR)
RECIPES := $(TOP)/recipes
@@ -131,7 +133,7 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d
$(SOURCESDIR)/$(UPST
# Rules to build and install the bootstrap compiler
###
-GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)"
+GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE)
PATH="$(PREFIX)/bin:$(PATH)"
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \
@@ -153,9 +155,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d:
$(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
$(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d
$(SOURCESDIR)/$(UPSTREAM_GCC_PATCH)
bzcat $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) | patch -d $(GCC_SRCDIR) -p1
cd $(GCC_SRCDIR) && ./contrib/gcc_update --touch
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath
for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR)
-p0 <$$p ; done
touch $@
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=8c92676e7ce1620309cfbb64b81266ec1ceae637
commit 8c92676e7ce1620309cfbb64b81266ec1ceae637
Author: François Revol <[email protected]>
Commit: Vincent Sanders <[email protected]>
atari-mint: update binutils
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index 43e6c56..0e98c1d 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -8,10 +8,10 @@ UPSTREAM_GCC_URI :=
http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPS
UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2
UPSTREAM_GCC_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GCC_PATCH)
-UPSTREAM_BINUTILS_VERSION := 2.24
+UPSTREAM_BINUTILS_VERSION := 2.28
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2
UPSTREAM_BINUTILS_URI :=
ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL)
-UPSTREAM_BINUTILS_PATCH := binutils-2.24-mint-20131217.patch.bz2
+UPSTREAM_BINUTILS_PATCH := binutils-2.28-mint-20170531.patch.bz2
UPSTREAM_BINUTILS_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_BINUTILS_PATCH)
UPSTREAM_GMP_VERSION := 4.3.2
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index d60f818..8b3800d 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -8,10 +8,10 @@ UPSTREAM_GCC_URI :=
http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPS
UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2
UPSTREAM_GCC_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GCC_PATCH)
-UPSTREAM_BINUTILS_VERSION := 2.24
+UPSTREAM_BINUTILS_VERSION := 2.28
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2
UPSTREAM_BINUTILS_URI :=
ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL)
-UPSTREAM_BINUTILS_PATCH := binutils-2.24-mint-20131217.patch.bz2
+UPSTREAM_BINUTILS_PATCH := binutils-2.28-mint-20170531.patch.bz2
UPSTREAM_BINUTILS_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_BINUTILS_PATCH)
UPSTREAM_GMP_VERSION := 4.3.2
-----------------------------------------------------------------------
Summary of changes:
README | 2 +-
m5475-atari-mint/Makefile | 30 ++++++++-----
m68k-atari-mint/Makefile | 26 ++++++-----
.../patches/openssl/Configurations-50-atari.conf.p | 45 ++++++++++++++++++++
.../openssl/{mem_sec.c.p => crypto.mem_sec.c.p} | 3 +-
.../patches/openssl/m5475-atari-mint/e_os.h.p | 18 ++++++++
.../m5475-atari-mint/include.openssl.e_os2.h.p | 14 ++++++
.../openssl/m68k-atari-mint/crypto.bn.Makefile.p | 12 ------
.../patches/openssl/m68k-atari-mint/e_os.h.p | 18 ++++++++
.../m68k-atari-mint/include.openssl.e_os2.h.p | 14 ++++++
10 files changed, 147 insertions(+), 35 deletions(-)
create mode 100644 sdk/recipes/patches/openssl/Configurations-50-atari.conf.p
rename sdk/recipes/patches/openssl/{mem_sec.c.p => crypto.mem_sec.c.p} (92%)
create mode 100644 sdk/recipes/patches/openssl/m5475-atari-mint/e_os.h.p
create mode 100644
sdk/recipes/patches/openssl/m5475-atari-mint/include.openssl.e_os2.h.p
delete mode 100644
sdk/recipes/patches/openssl/m68k-atari-mint/crypto.bn.Makefile.p
create mode 100644 sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
create mode 100644
sdk/recipes/patches/openssl/m68k-atari-mint/include.openssl.e_os2.h.p
diff --git a/README b/README
index 237dbb3..4c8797c 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ Pre-requisites for Debian systems
$ apt-get install build-essential autoconf automake autogen flex bison
$ apt-get install libtool texinfo help2man subversion cvs git
- $ apt-get install lhasa unzip autoconf2.64
+ $ apt-get install lhasa unzip autoconf2.64 automake1.11
On multiarch-aware systems:
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index 43e6c56..a59c304 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -8,10 +8,10 @@ UPSTREAM_GCC_URI :=
http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPS
UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2
UPSTREAM_GCC_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GCC_PATCH)
-UPSTREAM_BINUTILS_VERSION := 2.24
+UPSTREAM_BINUTILS_VERSION := 2.30
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2
UPSTREAM_BINUTILS_URI :=
ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL)
-UPSTREAM_BINUTILS_PATCH := binutils-2.24-mint-20131217.patch.bz2
+UPSTREAM_BINUTILS_PATCH := binutils-2.30-mint-20180703.patch.bz2
UPSTREAM_BINUTILS_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_BINUTILS_PATCH)
UPSTREAM_GMP_VERSION := 4.3.2
@@ -31,7 +31,7 @@ UPSTREAM_MINTBIN_VERSION := CVS-20110527
UPSTREAM_MINTBIN_TARBALL := mintbin-$(UPSTREAM_MINTBIN_VERSION).tar.gz
UPSTREAM_MINTBIN_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTBIN_TARBALL)
-UPSTREAM_MINTLIB_VERSION := CVS-20131219
+UPSTREAM_MINTLIB_VERSION := Git-20170304
UPSTREAM_MINTLIB_TARBALL := mintlib-$(UPSTREAM_MINTLIB_VERSION).tar.gz
UPSTREAM_MINTLIB_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTLIB_TARBALL)
@@ -49,6 +49,9 @@ GCC_AUTOCONF := autoconf2.64
GCC_AUTOHEADER := autoheader2.64
GCC_AUTORECONF := autoreconf2.64
GCC_AUTOM4TE := autom4te2.64
+GCC_AUTOMAKE := automake-1.11
+GCC_ACLOCAL := aclocal-1.11
+GCC_MAKEINFO := :
TOP := $(CURDIR)
RECIPES := $(TOP)/recipes
@@ -59,6 +62,8 @@ SRCDIR := $(BUILDDIR)/srcdir
GCC_SRCDIR := $(SRCDIR)/gcc
BINUTILS_SRCDIR := $(SRCDIR)/binutils
MINTBIN_SRCDIR := $(SRCDIR)/mintbin
+# optionally pass -jN here
+BUILD_SMP :=
TARGET_NAME := m5475-atari-mint
@@ -131,7 +136,7 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d
$(SOURCESDIR)/$(UPST
# Rules to build and install the bootstrap compiler
###
-GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)"
+GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE)
MAKEINFO=$(GCC_MAKEINFO) PATH="$(PREFIX)/bin:$(PATH)"
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \
@@ -140,9 +145,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d:
$(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
--enable-checking=no --enable-c99 \
--enable-maintainer-mode --without-headers \
--with-arch=cf
- cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-gcc
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc
- cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-target-libgcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-target-libgcc
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-target-libgcc
touch $@
@@ -154,9 +159,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d:
$(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
$(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d
$(SOURCESDIR)/$(UPSTREAM_GCC_PATCH)
bzcat $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) | patch -d $(GCC_SRCDIR) -p1
cd $(GCC_SRCDIR) && ./contrib/gcc_update --touch
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath
for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR)
-p0 <$$p ; done
touch $@
@@ -183,9 +188,12 @@ $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d:
$(BUILDSTEPS)/buildsteps.d $(SOURCESDIR
$(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d
mkdir -p $(BUILDDIR)/mintbin
- cd $(BUILDDIR)/mintbin && $(BINUTILS_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
+ cd $(BUILDDIR)/mintbin && $(MINTBIN_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
cd $(BUILDDIR)/mintbin && make
cd $(BUILDDIR)/mintbin && make install
+ #mv $(PREFIX)/{$(TARGET_NAME)/bin/$(TARGET_NAME)-* $(PREFIX)/bin/
+ #HACK: mintbin install traget looks broken
+ mv $(PREFIX)/*-atari-mint/bin/$(TARGET_NAME)-* $(PREFIX)/bin/
touch $@
$(BUILDSTEPS)/mintbin-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL)
@@ -200,7 +208,7 @@ $(BUILDSTEPS)/mintbin-srcdir.d:
$(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL)
$(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d
mkdir -p $(BUILDDIR)/binutils
cd $(BUILDDIR)/binutils && $(BINUTILS_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
- cd $(BUILDDIR)/binutils && make
+ cd $(BUILDDIR)/binutils && make $(BUILD_SMP)
cd $(BUILDDIR)/binutils && make install
touch $@
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index d60f818..053a6ad 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -8,10 +8,10 @@ UPSTREAM_GCC_URI :=
http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPS
UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2
UPSTREAM_GCC_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GCC_PATCH)
-UPSTREAM_BINUTILS_VERSION := 2.24
+UPSTREAM_BINUTILS_VERSION := 2.30
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2
UPSTREAM_BINUTILS_URI :=
ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL)
-UPSTREAM_BINUTILS_PATCH := binutils-2.24-mint-20131217.patch.bz2
+UPSTREAM_BINUTILS_PATCH := binutils-2.30-mint-20180703.patch.bz2
UPSTREAM_BINUTILS_PATCH_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_BINUTILS_PATCH)
UPSTREAM_GMP_VERSION := 4.3.2
@@ -49,6 +49,9 @@ GCC_AUTOCONF := autoconf2.64
GCC_AUTOHEADER := autoheader2.64
GCC_AUTORECONF := autoreconf2.64
GCC_AUTOM4TE := autom4te2.64
+GCC_AUTOMAKE := automake-1.11
+GCC_ACLOCAL := aclocal-1.11
+GCC_MAKEINFO := :
TOP := $(CURDIR)
RECIPES := $(TOP)/recipes
@@ -59,6 +62,8 @@ SRCDIR := $(BUILDDIR)/srcdir
GCC_SRCDIR := $(SRCDIR)/gcc
BINUTILS_SRCDIR := $(SRCDIR)/binutils
MINTBIN_SRCDIR := $(SRCDIR)/mintbin
+# optionally pass -jN here
+BUILD_SMP :=
TARGET_NAME := m68k-atari-mint
@@ -131,7 +136,7 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d
$(SOURCESDIR)/$(UPST
# Rules to build and install the bootstrap compiler
###
-GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)"
+GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER)
AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE)
MAKEINFO=$(GCC_MAKEINFO) PATH="$(PREFIX)/bin:$(PATH)"
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \
@@ -139,9 +144,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d:
$(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
--disable-nls --enable-languages=c \
--enable-checking=no --enable-c99 \
--enable-maintainer-mode --without-headers
- cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-gcc
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc
- cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-target-libgcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-target-libgcc
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-target-libgcc
touch $@
@@ -153,9 +158,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d:
$(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
$(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d
$(SOURCESDIR)/$(UPSTREAM_GCC_PATCH)
bzcat $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) | patch -d $(GCC_SRCDIR) -p1
cd $(GCC_SRCDIR) && ./contrib/gcc_update --touch
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp
- $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp
+ $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath
for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR)
-p0 <$$p ; done
touch $@
@@ -182,9 +187,10 @@ $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d:
$(BUILDSTEPS)/buildsteps.d $(SOURCESDIR
$(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d
mkdir -p $(BUILDDIR)/mintbin
- cd $(BUILDDIR)/mintbin && $(BINUTILS_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
+ cd $(BUILDDIR)/mintbin && $(MINTBIN_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
cd $(BUILDDIR)/mintbin && make
cd $(BUILDDIR)/mintbin && make install
+ mv $(PREFIX)/$(TARGET_NAME)/bin/$(TARGET_NAME)-* $(PREFIX)/bin/
touch $@
$(BUILDSTEPS)/mintbin-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL)
@@ -199,7 +205,7 @@ $(BUILDSTEPS)/mintbin-srcdir.d:
$(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL)
$(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d
mkdir -p $(BUILDDIR)/binutils
cd $(BUILDDIR)/binutils && $(BINUTILS_SRCDIR)/configure
--prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls
- cd $(BUILDDIR)/binutils && make
+ cd $(BUILDDIR)/binutils && make $(BUILD_SMP)
cd $(BUILDDIR)/binutils && make install
touch $@
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/mem_sec.c.p
b/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
similarity index 92%
rename from sdk/recipes/patches/openssl/mem_sec.c.p
rename to sdk/recipes/patches/openssl/crypto.mem_sec.c.p
index e209f75..271d571 100644
--- a/sdk/recipes/patches/openssl/mem_sec.c.p
+++ b/sdk/recipes/patches/openssl/crypto.mem_sec.c.p
@@ -1,6 +1,6 @@
--- crypto/mem_sec.c.orig 2019-02-13 14:25:17.725058588 +0000
+++ crypto/mem_sec.c 2019-02-13 14:35:39.790029062 +0000
-@@ -25,7 +25,11 @@
+@@ -25,7 +25,12 @@
#include <string.h>
/* e_os.h includes unistd.h, which defines _POSIX_VERSION */
@@ -9,6 +9,7 @@
+ && !defined(OPENSSL_SYS_RISCOS) \
+ && !defined(OPENSSL_SYS_AMIGAOS3) \
+ && !defined(OPENSSL_SYS_AMIGAOS4) \
++ && !defined(OPENSSL_SYS_MINT) \
+ && defined(OPENSSL_SYS_UNIX) \
&& ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
|| defined(__sun) || defined(__hpux) || defined(__sgi) \
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/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
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
