From a398a9bdc7419a0b05077aa86490a8820ea62a1e Mon Sep 17 00:00:00 2001 From: Ingo Paschke Date: Tue, 24 Mar 2026 12:49:14 +0100 Subject: [PATCH 1/2] Use NetHack's util/uudecode instead of system uudecode --- sys/unix/hints/include/cross-post.370 | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sys/unix/hints/include/cross-post.370 b/sys/unix/hints/include/cross-post.370 index e3b792edd..f28ec0fe1 100644 --- a/sys/unix/hints/include/cross-post.370 +++ b/sys/unix/hints/include/cross-post.370 @@ -304,7 +304,12 @@ fetch-regex: fi amitiles: $(AMITILES) -amigapkg: $(AMITILES) +UUDECODE = ../util/uudecode + +../util/uudecode: ../sys/share/uudecode.c + $(CC) $(CFLAGS) -o $@ $< + +amigapkg: $(AMITILES) ../util/uudecode mkdir -p $(TARGETPFX)pkg/tiles $(TARGETPFX)pkg/hack cp $(GAMEBIN) $(TARGETPFX)pkg/nethack cp ../dat/nhdat $(TARGETPFX)pkg/nhdat @@ -315,17 +320,17 @@ amigapkg: $(AMITILES) cp $(TARGETPFX)tomb.iff $(TARGETPFX)pkg/tomb.iff cp ../sys/msdos/sysconf $(TARGETPFX)pkg/sysconf cp ../doc/nethack.txt $(TARGETPFX)pkg/nethack.txt - ( cd $(TARGETPFX)pkg && uudecode ../../../sys/amiga/amifont8.uu && mv 8 hack/8 ) - ( cd $(TARGETPFX)pkg && uudecode ../../../sys/amiga/amifont.uu ) + ( cd $(TARGETPFX)pkg && ../../../util/uudecode ../../../sys/amiga/amifont8.uu && mv 8 hack/8 ) + ( cd $(TARGETPFX)pkg && ../../../util/uudecode ../../../sys/amiga/amifont.uu ) cp $(AMISRC)/nethack.cnf $(TARGETPFX)pkg/nethack.cnf -( cd $(TARGETPFX)pkg && test -f ../../../sys/amiga/dflticon.uu && \ - uudecode ../../../sys/amiga/dflticon.uu ) + ../../../util/uudecode ../../../sys/amiga/dflticon.uu ) -( cd $(TARGETPFX)pkg && test -f ../../../sys/amiga/NHinfo.uu && \ - uudecode ../../../sys/amiga/NHinfo.uu ) + ../../../util/uudecode ../../../sys/amiga/NHinfo.uu ) -( cd $(TARGETPFX)pkg && test -f ../../../sys/amiga/NewGame.uu && \ - uudecode ../../../sys/amiga/NewGame.uu ) + ../../../util/uudecode ../../../sys/amiga/NewGame.uu ) -( cd $(TARGETPFX)pkg && test -f ../../../sys/amiga/HackWB.uu && \ - uudecode ../../../sys/amiga/HackWB.uu ) + ../../../util/uudecode ../../../sys/amiga/HackWB.uu ) touch $(TARGETPFX)pkg/record ( cd $(TARGETPFX)pkg && zip -9r ../NH370AMI.ZIP * ) @echo amiga package zip file $(TARGETPFX)NH370AMI.ZIP From ced24f6fc9a9fd47ce7ec6a8c3d453741450e9cf Mon Sep 17 00:00:00 2001 From: Ingo Paschke Date: Tue, 24 Mar 2026 12:49:14 +0100 Subject: [PATCH 2/2] Remove dead -DLUA_32BITS=1 flag luaconf.h hardcodes #define LUA_32BITS 0 which overrides the command-line flag. m68k-amigaos-gcc supports long long so 32-bit mode is not needed anyway. --- sys/unix/hints/include/cross-pre2.370 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/unix/hints/include/cross-pre2.370 b/sys/unix/hints/include/cross-pre2.370 index 9e873e978..3476682ad 100644 --- a/sys/unix/hints/include/cross-pre2.370 +++ b/sys/unix/hints/include/cross-pre2.370 @@ -501,7 +501,7 @@ override TARGET_CFLAGS = -c -O2 -noixemul $(TOOLARCH) \ -DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_AMIGA \ -DAMIGA_VERSION_STRING=\""VER: NetHack 3.7.0"\" override TARGET_CXXFLAGS = $(TARGET_CFLAGS) -LUA_TARGET_CFLAGS = $(TARGET_CFLAGS) -DLUA_32BITS=1 +LUA_TARGET_CFLAGS = $(TARGET_CFLAGS) ifeq "$(REGEXOBJ)" "$(TARGETPFX)cppregex.o" override TARGET_LINK = $(TARGET_CXX) else