From ffd80eec1516466a41083c0d49594eda41dd49f7 Mon Sep 17 00:00:00 2001 From: Theo Markettos Date: Thu, 27 Jul 2023 13:46:07 +0100 Subject: [PATCH 1/3] Don't override CC / NATIVE_CC in GNUmakefile if already defined --- nettle/GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nettle/GNUmakefile b/nettle/GNUmakefile index efb5221..60cb8c2 100755 --- a/nettle/GNUmakefile +++ b/nettle/GNUmakefile @@ -2,8 +2,8 @@ # Makefile for cross-compiling Nettle # -CC = /home/riscos/gccsdk/cross/bin/arm-unknown-riscos-gcc -NATIVE_CC = /usr/bin/gcc +CC ?= /home/riscos/gccsdk/cross/bin/arm-unknown-riscos-gcc +NATIVE_CC ?= /usr/bin/gcc CFLAGS = -c -D_BSD_SOURCE -std=c9x -Wall -mpoke-function-name -I/home/riscos/gccsdk/env/include CONFIG = -DWITH_SSH From 9cbb3a19920148a68e06c9fed7aa9f951ec931d9 Mon Sep 17 00:00:00 2001 From: Theo Markettos Date: Thu, 27 Jul 2023 13:51:39 +0100 Subject: [PATCH 2/3] Link extra libs, conditional path to elf2air --- nettle/GNUmakefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nettle/GNUmakefile b/nettle/GNUmakefile index 60cb8c2..b0e269c 100755 --- a/nettle/GNUmakefile +++ b/nettle/GNUmakefile @@ -6,8 +6,11 @@ CC ?= /home/riscos/gccsdk/cross/bin/arm-unknown-riscos-gcc NATIVE_CC ?= /usr/bin/gcc CFLAGS = -c -D_BSD_SOURCE -std=c9x -Wall -mpoke-function-name -I/home/riscos/gccsdk/env/include CONFIG = -DWITH_SSH +ELF2AIF ?= /home/riscos/gccsdk/cross/bin/elf2aif LIBS = -L/home/riscos/gccsdk/env/lib -lssh2 -lgcrypt -lgpg-error -lcrypto +LIBS += -lz -ldl + OBJS = chardefn.o choices.o dnslib.o globals.o init.o keyboard.o lineedit.o \ main.o misc.o hotlist.o nettle.o process.o socket.o quit.o seln.o \ wimp.o zapgen.o fortify.o sockwatch.o messages.o termlist.o url.o \ @@ -24,7 +27,7 @@ all: !Nettle/!RunImage,ff8 !Nettle/!RunImage,ff8: !Nettle/!RunImage,e1f @echo " ELF2AIF:" $@ - @/home/riscos/gccsdk/cross/bin/elf2aif $< $@ + @$(ELF2AIF) $< $@ @rm !Nettle/!RunImage,e1f !Nettle/!RunImage,e1f: $(OBJS) From e009f7bb4365e7d31c9657142d5c674e301ff9d7 Mon Sep 17 00:00:00 2001 From: Theo Markettos Date: Thu, 27 Jul 2023 17:41:38 +0100 Subject: [PATCH 3/3] Speculatively bump version to 0.2050b, so no clash with previous builds The version numbering strategy seems pretty peculiar as to why it uses the fourth decimal place, so I unilaterally decided that I'm going to bump the third decimal place and mostly ignore the fourth. I presume the suffix 'b' is for beta and 'r' is for release. --- nettle/!Nettle/Resources/France/Messages | 4 ++-- nettle/!Nettle/Resources/Germany/Messages | 4 ++-- nettle/!Nettle/Resources/UK/Messages | 4 ++-- nettle/!RelSrc,fd7 | 2 +- nettle/!Release,feb | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nettle/!Nettle/Resources/France/Messages b/nettle/!Nettle/Resources/France/Messages index 7fa4d7b..e010b38 100644 --- a/nettle/!Nettle/Resources/France/Messages +++ b/nettle/!Nettle/Resources/France/Messages @@ -3,8 +3,8 @@ AppName:Nettle AppPurpose:Client telnet arachnéen -AppAuthor:© Développeurs de Nettle, 2000-2010 -AppVersion:v0.2043b (11 Avril 2010) +AppAuthor:© Développeurs de Nettle, 2000-2023 +AppVersion:v0.2050b (28 Juillet 2023) Info:Info> Choices:Préférences... diff --git a/nettle/!Nettle/Resources/Germany/Messages b/nettle/!Nettle/Resources/Germany/Messages index f0fce82..9b01432 100644 --- a/nettle/!Nettle/Resources/Germany/Messages +++ b/nettle/!Nettle/Resources/Germany/Messages @@ -3,8 +3,8 @@ AppName:Nettle AppPurpose:Telnet client -AppAuthor:© Nettle Entwickler, 2000-2010 -AppVersion:v0.2043b (11 April 2010) +AppAuthor:© Nettle Entwickler, 2000-2023 +AppVersion:v0.2050b (27 Juli 2023) Info:Info> Choices:Einstellungen... diff --git a/nettle/!Nettle/Resources/UK/Messages b/nettle/!Nettle/Resources/UK/Messages index c995727..51e0c32 100644 --- a/nettle/!Nettle/Resources/UK/Messages +++ b/nettle/!Nettle/Resources/UK/Messages @@ -3,8 +3,8 @@ AppName:Nettle AppPurpose:Telnet client -AppAuthor:© Nettle developers, 2000-2010 -AppVersion:v0.2043b (11 April 2010) +AppAuthor:© Nettle developers, 2000-2023 +AppVersion:v0.2050b (27 July 2023) Info:Info> Choices:Choices... diff --git a/nettle/!RelSrc,fd7 b/nettle/!RelSrc,fd7 index c3d0a91..d547eec 100755 --- a/nettle/!RelSrc,fd7 +++ b/nettle/!RelSrc,fd7 @@ -1,5 +1,5 @@ -Set RelVer 0-2043b +Set RelVer 0-2050b Echo Releasing Nettle *SOURCE CODE* ... diff --git a/nettle/!Release,feb b/nettle/!Release,feb index 1b809d0..116b200 100755 --- a/nettle/!Release,feb +++ b/nettle/!Release,feb @@ -1,5 +1,5 @@ -Set RelVer 0-2043b +Set RelVer 0-2050b Echo Releasing Nettle ...