From d3446750adf6a7975c86ca1b76a46bebd9544349 Mon Sep 17 00:00:00 2001 From: vxtls <187420201+vxtls@users.noreply.github.com> Date: Tue, 3 Mar 2026 19:53:30 -0500 Subject: [PATCH] chore(steps-guix): remove deprecated bash-4.4.23-1 step --- steps-guix/bash-4.4.23-1/pass1.sh | 27 ------ .../fix-list-function-prototypes-c23.patch | 21 ----- .../fix-mkbuiltins-prototypes-c23.patch | 89 ------------------- .../patches/fix-sigreturn-on-linux.patch | 19 ---- steps-guix/bash-4.4.23-1/sources | 1 - 5 files changed, 157 deletions(-) delete mode 100644 steps-guix/bash-4.4.23-1/pass1.sh delete mode 100644 steps-guix/bash-4.4.23-1/patches/fix-list-function-prototypes-c23.patch delete mode 100644 steps-guix/bash-4.4.23-1/patches/fix-mkbuiltins-prototypes-c23.patch delete mode 100644 steps-guix/bash-4.4.23-1/patches/fix-sigreturn-on-linux.patch delete mode 100644 steps-guix/bash-4.4.23-1/sources diff --git a/steps-guix/bash-4.4.23-1/pass1.sh b/steps-guix/bash-4.4.23-1/pass1.sh deleted file mode 100644 index 45a3f030..00000000 --- a/steps-guix/bash-4.4.23-1/pass1.sh +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -SEED_PREFIX="/bootstrap-seeds/bash-4.4.23-1" - -src_prepare() { - default -} - -src_configure() { - ./configure \ - --prefix="${SEED_PREFIX}" \ - --without-bash-malloc \ - --disable-nls \ - --enable-static-link \ - --build="${TARGET}" \ - bash_cv_dev_stdin=absent \ - bash_cv_dev_fd=whacky -} - -src_compile() { - make -j1 -} - -src_install() { - install -D -m 0755 bash "${DESTDIR}${SEED_PREFIX}/bin/bash" - ln -sf bash "${DESTDIR}${SEED_PREFIX}/bin/sh" -} diff --git a/steps-guix/bash-4.4.23-1/patches/fix-list-function-prototypes-c23.patch b/steps-guix/bash-4.4.23-1/patches/fix-list-function-prototypes-c23.patch deleted file mode 100644 index 7649fe73..00000000 --- a/steps-guix/bash-4.4.23-1/patches/fix-list-function-prototypes-c23.patch +++ /dev/null @@ -1,21 +0,0 @@ -SPDX-License-Identifier: GPL-3.0-or-later - -Fix list function declarations to use proper prototypes for C23. - ---- bash-4.4/externs.h -+++ bash-4.4/externs.h -@@ -141,10 +141,10 @@ - /* Declarations for functions defined in list.c. */ - extern void list_walk __P((GENERIC_LIST *, sh_glist_func_t *)); - extern void wlist_walk __P((WORD_LIST *, sh_icpfunc_t *)); --extern GENERIC_LIST *list_reverse (); --extern int list_length (); --extern GENERIC_LIST *list_append (); --extern GENERIC_LIST *list_remove (); -+extern GENERIC_LIST *list_reverse __P((GENERIC_LIST *)); -+extern int list_length __P((GENERIC_LIST *)); -+extern GENERIC_LIST *list_append __P((GENERIC_LIST *, GENERIC_LIST *)); -+extern GENERIC_LIST *list_remove __P((GENERIC_LIST **, Function *, char *)); - - /* Declarations for functions defined in stringlib.c */ - extern int find_string_in_alist __P((char *, STRING_INT_ALIST *, int)); diff --git a/steps-guix/bash-4.4.23-1/patches/fix-mkbuiltins-prototypes-c23.patch b/steps-guix/bash-4.4.23-1/patches/fix-mkbuiltins-prototypes-c23.patch deleted file mode 100644 index dead66ed..00000000 --- a/steps-guix/bash-4.4.23-1/patches/fix-mkbuiltins-prototypes-c23.patch +++ /dev/null @@ -1,89 +0,0 @@ -SPDX-License-Identifier: GPL-3.0-or-later - -Fix mkbuiltins prototypes and definitions for C23-compatible compilers. - ---- bash-4.4/builtins/mkbuiltins.c -+++ bash-4.4/builtins/mkbuiltins.c -@@ -190,13 +190,13 @@ - - void write_file_headers (); - void write_file_footers (); --void write_ifdefs (); --void write_endifs (); --void write_documentation (); -+void write_ifdefs (FILE *, char **); -+void write_endifs (FILE *, char **); -+void write_documentation (FILE *, char **, int, int); - void write_longdocs (); - void write_builtins (); - --int write_helpfiles (); -+int write_helpfiles (ARRAY *); - - void free_defs (); - void add_documentation (); -@@ -1018,8 +1018,7 @@ - static void memory_error_and_abort (); - - static char * --xmalloc (bytes) -- int bytes; -+xmalloc (int bytes) - { - char *temp = (char *)malloc (bytes); - -@@ -1029,9 +1028,7 @@ - } - - static char * --xrealloc (pointer, bytes) -- char *pointer; -- int bytes; -+xrealloc (char *pointer, int bytes) - { - char *temp; - -@@ -1375,9 +1372,7 @@ - If a define is preceded by an `!', then the sense of the test is - reversed. */ - void --write_ifdefs (stream, defines) -- FILE *stream; -- char **defines; -+write_ifdefs (FILE *stream, char **defines) - { - register int i; - -@@ -1406,9 +1401,7 @@ - STREAM is the stream to write the information to. - DEFINES is a null terminated array of define names. */ - void --write_endifs (stream, defines) -- FILE *stream; -- char **defines; -+write_endifs (FILE *stream, char **defines) - { - register int i; - -@@ -1433,10 +1426,7 @@ - internationalization (gettext) and the single-string vs. multiple-strings - issues. */ - void --write_documentation (stream, documentation, indentation, flags) -- FILE *stream; -- char **documentation; -- int indentation, flags; -+write_documentation (FILE *stream, char **documentation, int indentation, int flags) - { - register int i, j; - register char *line; -@@ -1564,8 +1554,7 @@ - } - - int --write_helpfiles (builtins) -- ARRAY *builtins; -+write_helpfiles (ARRAY *builtins) - { - char *helpfile, *bname; - FILE *helpfp; diff --git a/steps-guix/bash-4.4.23-1/patches/fix-sigreturn-on-linux.patch b/steps-guix/bash-4.4.23-1/patches/fix-sigreturn-on-linux.patch deleted file mode 100644 index 9276b854..00000000 --- a/steps-guix/bash-4.4.23-1/patches/fix-sigreturn-on-linux.patch +++ /dev/null @@ -1,19 +0,0 @@ -SPDX-License-Identifier: GPL-3.0-or-later - -Fix SIGRETURN for Linux builds when VOID_SIGHANDLER probe is inaccurate. - -On modern Linux toolchains, signal handlers return void. If VOID_SIGHANDLER -is not defined during configure probing, SIGRETURN expands to return(n), -which fails in void handlers (e.g. eval.c: alrm_catcher). - ---- bash-4.4/sig.h -+++ bash-4.4/sig.h -@@ -34,7 +34,7 @@ - #define sighandler RETSIGTYPE - typedef RETSIGTYPE SigHandler __P((int)); - --#if defined (VOID_SIGHANDLER) -+#if defined (VOID_SIGHANDLER) || defined (__linux__) - # define SIGRETURN(n) return - #else - # define SIGRETURN(n) return(n) diff --git a/steps-guix/bash-4.4.23-1/sources b/steps-guix/bash-4.4.23-1/sources deleted file mode 100644 index b3986593..00000000 --- a/steps-guix/bash-4.4.23-1/sources +++ /dev/null @@ -1 +0,0 @@ -f https://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb