git: 6b2b72e2c8f8 - main - shells/ksh-devel: update to the latest ksh93/ksh github commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 26 Jun 2024 16:34:18 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6b2b72e2c8f8eb8a1a25d6fb95e8eb279ed7af8d
commit 6b2b72e2c8f8eb8a1a25d6fb95e8eb279ed7af8d
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-06-26 16:31:29 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-06-26 16:33:40 +0000
shells/ksh-devel: update to the latest ksh93/ksh github commit
A patch was added to revert upstream commit e8b45cc8. This upstream
commit was causing numererous build failures.
---
shells/ksh-devel/Makefile | 5 +--
shells/ksh-devel/distinfo | 6 +--
shells/ksh-devel/files/patch-src_INIT_mamake.c | 53 ++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile
index 5aad003c2e6d..a8a8abf5509f 100644
--- a/shells/ksh-devel/Makefile
+++ b/shells/ksh-devel/Makefile
@@ -20,8 +20,8 @@ WWW= http://www.kornshell.com/
LICENSE= EPL
-HASH= 2e8aeee9
-AST_COMMIT_DATE= 2024.04.06
+HASH= 1407f3be
+AST_COMMIT_DATE= 2024.06.26
USES= compiler:c11
@@ -48,7 +48,6 @@ KSH93D_DESC= Install to ${PREFIX}/bin/ksh93d (development)
CFLAGS+= -DMAP_TYPE
LDFLAGS+= -lm
MAKE_ENV= CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses" CFLAGS="${CFLAGS}"
-
STATIC_MAKE_ENV= LDFLAGS+=-static
KSH_PLIST_SUB= 93=""
diff --git a/shells/ksh-devel/distinfo b/shells/ksh-devel/distinfo
index be3f2eec79b3..f67d22075699 100644
--- a/shells/ksh-devel/distinfo
+++ b/shells/ksh-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715612864
-SHA256 (ksh93-ksh-2024.04.06-2e8aeee9_GH0.tar.gz) = 517634a35c66117cb82a5808752fcfad2a0286ca74a0364f1ae35960dee8c368
-SIZE (ksh93-ksh-2024.04.06-2e8aeee9_GH0.tar.gz) = 2089545
+TIMESTAMP = 1719406732
+SHA256 (ksh93-ksh-2024.06.26-1407f3be_GH0.tar.gz) = e91b0c27d60af06527feedd0745cd4c63941e88161a4aba61db9a6b044057238
+SIZE (ksh93-ksh-2024.06.26-1407f3be_GH0.tar.gz) = 2088543
diff --git a/shells/ksh-devel/files/patch-src_INIT_mamake.c b/shells/ksh-devel/files/patch-src_INIT_mamake.c
new file mode 100644
index 000000000000..6373af9f9c7d
--- /dev/null
+++ b/shells/ksh-devel/files/patch-src_INIT_mamake.c
@@ -0,0 +1,53 @@
+diff --git src/cmd/INIT/mamake.c src/cmd/INIT/mamake.c
+index 1cc85f1f..6785ff03 100644
+--- src/cmd/INIT/mamake.c
++++ src/cmd/INIT/mamake.c
+@@ -27,7 +27,7 @@
+ * coded for portability
+ */
+
+-#define RELEASE_DATE "2024-06-25"
++#define RELEASE_DATE "2024-04-02"
+ static char id[] = "\n@(#)$Id: mamake (ksh 93u+m) " RELEASE_DATE " $\0\n";
+
+ #if _PACKAGE_ast
+@@ -297,6 +297,7 @@ static struct /* program state */
+ int indent; /* debug indent */
+ int keepgoing; /* do siblings on error */
+ int never; /* never execute */
++ int probed; /* probe already done */
+ int verified; /* don't bother with verify() */
+
+ Stream_t streams[4]; /* input file stream stack */
+@@ -1346,7 +1347,7 @@ static unsigned long run(Rule_t *r, char *s)
+ /* find commands in the current working directory first */
+ append(buf,
+ "case $PATH in\n"
+- ".:* | :*) ;;\n"
++ ".:*) ;;\n"
+ "*) PATH=.:$PATH;;\n"
+ "esac\n"
+ );
+@@ -1860,7 +1861,7 @@ static unsigned long make(Rule_t *r, int inloop, unsigned long modtime, Buf_t **
+ else
+ s = 0;
+ /* only bother if t is a path to a *.a we built (i.e. not -l...) */
+- if (t[0] && (t[0] != '-' || t[1] != 'l'))
++ if (t[0] != '-' || t[1] != 'l')
+ {
+ q = rule(expand(buf, t));
+ attributes(q, v);
+@@ -2112,8 +2113,11 @@ static unsigned long make(Rule_t *r, int inloop, unsigned long modtime, Buf_t **
+ setval(state.vars, t, v);
+ if (strcmp(t, "MAMAKE_STRICT") == 0)
+ state.strict = *v ? atoi(v) : 1;
+- else if (strcmp(t, "CC") == 0)
+- probe();
++ }
++ if (!state.probed && strcmp(t, "CC") == 0)
++ {
++ state.probed = 1;
++ probe();
+ }
+ continue;
+