m68k-atari-mint: fix toolchain build

4 files changed, 30 insertions, 20 deletions

diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index 90addd1..f05fb8e 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -41,7 +41,7 @@ UPSTREAM_PML_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives
 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-20230112
+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)
 
@@ -86,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 $@
 
 ###
diff --git a/m68k-atari-mint/recipes/patches/gemlib/CONFIGVARS.p b/m68k-atari-mint/recipes/patches/gemlib/CONFIGVARS.p
index 6f774db..c865542 100644
--- a/m68k-atari-mint/recipes/patches/gemlib/CONFIGVARS.p
+++ b/m68k-atari-mint/recipes/patches/gemlib/CONFIGVARS.p
@@ -1,20 +1,19 @@
 --- CONFIGVARS	2011-05-13 23:38:45.000000000 +0100
 +++ CONFIGVARS	2011-05-13 23:40:11.000000000 +0100
-@@ -2,7 +2,7 @@
- # 
+@@ -3,6 +3,7 @@
  # cross compiling
  #CROSS = yes
--CROSS = no
+ #CROSS = no
 +CROSS = yes
  
- #
- # build alternate libraries for processor variants
-@@ -21,7 +21,7 @@
+ # 
+ # cross compiling
+@@ -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/m68k-atari-mint/cross/m68k-atari-mint
- 
- else
- 
+ ifeq ($(PREFIX),)
+   PREFIX=/usr/$(CROSS_TOOL)
+ endif
diff --git a/m68k-atari-mint/recipes/patches/mintlib/configvars.p b/m68k-atari-mint/recipes/patches/mintlib/configvars.p
index 1df9fae..2c00bec 100644
--- a/m68k-atari-mint/recipes/patches/mintlib/configvars.p
+++ b/m68k-atari-mint/recipes/patches/mintlib/configvars.p
@@ -9,15 +9,15 @@
  
  # Silent build or verbose
  AM_DEFAULT_VERBOSITY = 1
-@@ -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/m68k-atari-mint/cross/m68k-atari-mint
- else
-  prefix=/usr
- endif
+-prefix=/usr
++prefix=/opt/netsurf/m68k-atari-mint/cross/m68k-atari-mint
+ 
+ # This is where include files get installed.
+ includedir=${prefix}/include
 @@ -124,7 +124,7 @@
  CFLAGS=-O2 -fomit-frame-pointer
  
diff --git a/m68k-atari-mint/recipes/patches/mintlib/posix_regex.p b/m68k-atari-mint/recipes/patches/mintlib/posix_regex.p
new file mode 100644
index 0000000..6a42a40
--- /dev/null
+++ b/m68k-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
+