Ports: Update awk to 20240728

This commit is contained in:
Linus Groh authored and Nico Weber committed 2024-10-26 23:32:07 -04:00
1 parent 334aedfb52
commit 60b23029ae
6 files changed
+52 -34

No files matched your search

+1 -1
View File
@@ -13,7 +13,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`angband`](angband/) | Angband | 4.2.5 | https://rephial.org |
| [`Another-World`](Another-World/) | Another World Bytecode Interpreter | | https://github.com/fabiensanglard/Another-World-Bytecode-Interpreter |
| [`aria2`](aria2/) | aria2 | 1.37.0 | https://aria2.github.io |
| [`awk`](awk/) | The One True Awk | 20220122 | https://github.com/onetrueawk/awk |
| [`awk`](awk/) | The One True Awk | 20240728 | https://github.com/onetrueawk/awk |
| [`backward-cpp`](backward-cpp/) | Backward-cpp | 65a769f | https://github.com/bombela/backward-cpp |
| [`bash`](bash/) | GNU Bash | 5.2.37 | https://www.gnu.org/software/bash/ |
| [`bass`](bass/) | Beneath a Steel Sky | cd-1.2 | https://www.scummvm.org/games |
+2 -2
View File
@@ -1,9 +1,9 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=awk
version=20220122
version=20240728
useconfigure="false"
files=(
"https://github.com/onetrueawk/awk/archive/refs/tags/${version}.tar.gz#720a06ff8dcc12686a5176e8a4c74b1295753df816e38468a6cf077562d54042"
"https://github.com/onetrueawk/awk/archive/refs/tags/${version}.tar.gz#2d479817f95d5997fc4348ecebb1d8a1b25c81cebedb46ca4f59434247e08543"
)
patchlevel=1
@@ -9,16 +9,17 @@ Subject: [PATCH] Make it possible to override HOSTCC and CC from the
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/makefile b/makefile
index 9ceaaad..6b9dff5 100644
index 0240e5ec9ffe3699aadd0fce2466466b7ceea614..865d52f5b5f8a1fe58125c058a03523f7e79db12 100644
--- a/makefile
+++ b/makefile
@@ -31,8 +31,8 @@ CFLAGS = -O2
#CC = gcc -Wall -g -Wwrite-strings
#CC = gcc -O4 -Wall -pedantic -fno-strict-aliasing
#CC = gcc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov
-HOSTCC = gcc -g -Wall -pedantic -Wcast-qual
@@ -31,9 +31,9 @@ CFLAGS = -O2
#CC = cc -Wall -g -Wwrite-strings
#CC = cc -O4 -Wall -pedantic -fno-strict-aliasing
#CC = cc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov
-HOSTCC = cc -g -Wall -pedantic -Wcast-qual
+HOSTCC ?= cc -g -Wall -pedantic -Wcast-qual
# HOSTCC = g++ -g -Wall -pedantic -Wcast-qual
-CC = $(HOSTCC) # change this is cross-compiling.
+HOSTCC ?= gcc -g -Wall -pedantic -Wcast-qual
+CC ?= $(HOSTCC) # change this is cross-compiling.
# By fiat, to make our lives easier, yacc is now defined to be bison.
@@ -0,0 +1,30 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Linus Groh <[email protected]>
Date: Sun, 27 Oct 2024 01:53:40 +0000
Subject: [PATCH] Fix duplicate case value build error
```
[awk/build] main.c: In function 'fpecatch':
[awk/build] main.c:92:9: error: duplicate case value
[awk/build] 92 | case 0:
[awk/build] | ^~~~
[awk/build] main.c:68:9: note: previously used here
[awk/build] 68 | case FPE_INTDIV:
[awk/build] | ^~~~
```
---
main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/main.c b/main.c
index 7d3ef84a580f4775b3faf463d94d580e22945750..3ef15da32ef4c1f55144e21e328b60d82b1ee885 100644
--- a/main.c
+++ b/main.c
@@ -89,7 +89,6 @@ static noreturn void fpecatch(int n
case FPE_FLTSUB:
mesg = "Subscript out of range";
break;
- case 0:
default:
mesg = "Unknown error";
break;
@@ -1,22 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mattias Nilsson <[email protected]>
Date: Mon, 4 Apr 2022 22:05:38 +0200
Subject: [PATCH] Make the version descriptor match the built tag
---
main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.c b/main.c
index 986f1a3..e22f097 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
THIS SOFTWARE.
****************************************************************/
-const char *version = "version 20211208";
+const char *version = "version 20220122";
#define DEBUG
#include <stdio.h>
+11 -2
View File
@@ -5,8 +5,17 @@
Make it possible to override HOSTCC and CC from the environment
## `0002-Make-the-version-descriptor-match-the-built-tag.patch`
## `0002-Fix-duplicate-case-value-build-error.patch`
Make the version descriptor match the built tag
Fix duplicate case value build error
```
[awk/build] main.c: In function 'fpecatch':
[awk/build] main.c:92:9: error: duplicate case value
[awk/build] 92 | case 0:
[awk/build] | ^~~~
[awk/build] main.c:68:9: note: previously used here
[awk/build] 68 | case FPE_INTDIV:
[awk/build] | ^~~~
```