summaryrefslogtreecommitdiff
path: root/m5475-atari-mint
diff options
context:
space:
mode:
Diffstat (limited to 'm5475-atari-mint')
-rw-r--r--m5475-atari-mint/Makefile39
-rwxr-xr-xm5475-atari-mint/fetchsrc2
-rw-r--r--m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p39
-rw-r--r--m5475-atari-mint/recipes/patches/mintlib/configvars.p35
-rw-r--r--m5475-atari-mint/recipes/patches/mintlib/posix_regex.p11
5 files changed, 71 insertions, 55 deletions
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index 43e6c56..6ed3b4c 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -5,13 +5,13 @@
UPSTREAM_GCC_VERSION := 4.6.4
UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2
UPSTREAM_GCC_URI := http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TARBALL)
-UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2
+UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20200504.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
@@ -27,21 +27,21 @@ UPSTREAM_MPC_VERSION := 0.8.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL)
-UPSTREAM_MINTBIN_VERSION := CVS-20110527
+UPSTREAM_MINTBIN_VERSION := Git-20201129
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-20220821
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)
UPSTREAM_PML_VERSION := 2.03
UPSTREAM_PML_TARBALL := pml-$(UPSTREAM_PML_VERSION).tar.bz2
UPSTREAM_PML_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_PML_TARBALL)
-UPSTREAM_PML_PATCH := pml-2.03-mint-20110207.patch.bz2
+UPSTREAM_PML_PATCH := pml-2.03-mint-20191013.patch.bz2
UPSTREAM_PML_PATCH_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_PML_PATCH)
-UPSTREAM_GEMLIB_VERSION := CVS-20130415
+UPSTREAM_GEMLIB_VERSION := Git-20230112
UPSTREAM_GEMLIB_TARBALL := gemlib-$(UPSTREAM_GEMLIB_VERSION).tar.bz2
UPSTREAM_GEMLIB_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GEMLIB_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
@@ -81,8 +86,8 @@ $(BUILDSTEPS)/gemlib.d: $(BUILDSTEPS)/stage2.d $(SOURCESDIR)/$(UPSTREAM_GEMLIB_T
tar xjf $(SOURCESDIR)/$(UPSTREAM_GEMLIB_TARBALL)
mv gemlib-$(UPSTREAM_GEMLIB_VERSION) $(BUILDDIR)/gemlib
for p in `ls $(RECIPES)/patches/gemlib/*.p` ; do patch -d $(BUILDDIR)/gemlib -p0 <$$p ; done
- cd $(BUILDDIR)/gemlib/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make
- cd $(BUILDDIR)/gemlib/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make install
+ cd $(BUILDDIR)/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make
+ cd $(BUILDDIR)/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make install
touch $@
###
@@ -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,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 $@
@@ -200,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/m5475-atari-mint/fetchsrc b/m5475-atari-mint/fetchsrc
index bbe8f6b..9396a4e 100755
--- a/m5475-atari-mint/fetchsrc
+++ b/m5475-atari-mint/fetchsrc
@@ -4,7 +4,7 @@
# Usage fetchsrc <target> <source> <upstream> <output>
-NSSRV="http://ci.netsurf-browser.org/toolchain/"
+NSSRV="https://ci.netsurf-browser.org/toolchain/"
wget -q -O ${4} ${NSSRV}/${1}/${2}
if [ $? -ne 0 ];then
diff --git a/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p b/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p
index 5692a21..f65dc89 100644
--- a/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p
+++ b/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p
@@ -1,29 +1,28 @@
---- CONFIGVARS.orig 2012-10-11 17:55:52.000000000 +0100
-+++ CONFIGVARS 2012-10-11 17:56:37.000000000 +0100
-@@ -1,8 +1,8 @@
- #
- #
+--- CONFIGVARS 2011-05-13 23:38:45.000000000 +0100
++++ CONFIGVARS 2011-05-13 23:40:11.000000000 +0100
+@@ -3,6 +3,7 @@
# cross compiling
--#CROSS = yes
--CROSS = no
+ #CROSS = yes
+ #CROSS = no
+CROSS = yes
-+#CROSS = no
- #
- # build alternate libraries for processor variants
-@@ -15,13 +15,13 @@
#
+ # cross compiling
+@@ -33,7 +34,7 @@
+ CROSS := yes
+ else
ifeq ($(CROSS),yes)
-
--CROSSPREFIX=m68k-atari-mint-
-+CROSSPREFIX=m5475-atari-mint-
-
- NATIVECC = gcc
+- CROSS_TOOL=m68k-atari-mint
++ CROSS_TOOL=m5475-atari-mint
+ CROSSPREFIX=$(CROSS_TOOL)-
+ else
+ CROSSPREFIX=
+@@ -46,7 +47,7 @@
NATIVECFLAGS = -O
CRLF = echo crlf -s
--PREFIX=/usr/m68k-atari-mint
+-PREFIX=$(shell $(CROSSPREFIX)gcc -print-sysroot)/usr
+PREFIX=/opt/netsurf/m5475-atari-mint/cross/m5475-atari-mint
-
- else
-
+ ifeq ($(PREFIX),)
+ PREFIX=/usr/$(CROSS_TOOL)
+ endif
diff --git a/m5475-atari-mint/recipes/patches/mintlib/configvars.p b/m5475-atari-mint/recipes/patches/mintlib/configvars.p
index f72d6f4..803272a 100644
--- a/m5475-atari-mint/recipes/patches/mintlib/configvars.p
+++ b/m5475-atari-mint/recipes/patches/mintlib/configvars.p
@@ -1,6 +1,6 @@
--- ./configvars.orig 2012-05-03 19:26:10.000000000 +0200
-+++ ./configvars 2012-11-05 23:03:52.000000000 +0100
-@@ -12,14 +12,14 @@
++++ ./configvars 2012-11-05 22:34:07.000000000 +0100
+@@ -12,7 +12,7 @@
# get installed. You have to take car yourself that the libraries
# and include files and so on will get installed in the right place
# The easiest way to do this is to change "prefix", see below.
@@ -9,29 +9,30 @@
# Silent build or verbose
AM_DEFAULT_VERBOSITY = 1
-
- # Define this to "m68k-atari-mint-" if you cross compile.
+@@ -35,7 +35,7 @@
+ CROSS := yes
+ else
ifeq ($(CROSS),yes)
-- toolprefix=m68k-atari-mint-
-+ toolprefix=m5475-atari-mint-
+- CROSS_TOOL=m68k-atari-mint
++ CROSS_TOOL=m5475-atari-mint
+ toolprefix=$(CROSS_TOOL)-
else
toolprefix=
- endif
-@@ -47,7 +47,7 @@
+@@ -64,7 +64,7 @@
+ # This variable is used for various others. Change its value if
# need be. When cross-compiling you will usually want to set this
# to "/usr/m68k-atari-mint".
- ifeq ($(CROSS),yes)
-- prefix=/usr/m68k-atari-mint
-+ prefix=/opt/netsurf/m5475-atari-mint/cross/m5475-atari-mint
- else
- prefix=/usr
- endif
-@@ -124,7 +124,7 @@
- CFLAGS=-O2 -fomit-frame-pointer
+-prefix=/usr
++prefix=/opt/netsurf/m5475-atari-mint/cross/m5475-atari-mint
+
+ # This is where include files get installed.
+ includedir=${prefix}/include
+@@ -141,7 +141,7 @@
+ LDFLAGS=
# Additional defines.
-DEFS=
+DEFS=-DREGEX_MALLOC
# Define this to the warning level you want.
- WARN=-Wall
+ WARN=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -Wold-style-declaration -Wold-style-definition
diff --git a/m5475-atari-mint/recipes/patches/mintlib/posix_regex.p b/m5475-atari-mint/recipes/patches/mintlib/posix_regex.p
new file mode 100644
index 0000000..6a42a40
--- /dev/null
+++ b/m5475-atari-mint/recipes/patches/mintlib/posix_regex.p
@@ -0,0 +1,11 @@
+--- ./posix/regex.c.orig 2012-05-03 19:26:10.000000000 +0200
++++ ./posix/regex.c 2012-11-05 22:34:07.000000000 +0100
+@@ -1364,6 +1364,7 @@
+ \
+ DEBUG_PRINT2 (" Pushing failure id: %u\n", failure_id); \
+ DEBUG_PUSH (failure_id); \
++ (void) destination; \
+ } while (0)
+
+ /* This is the number of items that are pushed and popped on the stack
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-24 03:04:25 +0000