From 132b75c2d02e7da75a8fda0333f153c4ccefe6c9 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Tue, 7 Jul 2026 15:50:25 +0300 Subject: [PATCH] ports/bash: Fix compilation with moved winsize --- ports/bash/build.sh | 4 ++-- ...atch => 0001-fix-non-multibyte-compilation.patch} | 0 .../0002-remove-cut-and-getconf-builtins.patch | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) rename ports/bash/patches/{0001-Fix-non-multibyte-compilation.patch => 0001-fix-non-multibyte-compilation.patch} (100%) delete mode 100644 ports/bash/patches/0002-remove-cut-and-getconf-builtins.patch diff --git a/ports/bash/build.sh b/ports/bash/build.sh index bd301c7b..5115ae29 100755 --- a/ports/bash/build.sh +++ b/ports/bash/build.sh @@ -10,8 +10,8 @@ CONFIGURE_OPTIONS=( '--without-bash-malloc' '--with-curses' 'bash_cv_unusable_rtsigs=no' - 'bash_cv_signal_vintage=posix' - 'CFLAGS=-std=c17' + 'bash_cv_struct_winsize_termios=yes' # configure checks for sys/termios.h? code uses termios.h correctly + 'CFLAGS=-std=c17 -Wno-discarded-qualifiers' 'CFLAGS_FOR_BUILD=-std=c17' ) diff --git a/ports/bash/patches/0001-Fix-non-multibyte-compilation.patch b/ports/bash/patches/0001-fix-non-multibyte-compilation.patch similarity index 100% rename from ports/bash/patches/0001-Fix-non-multibyte-compilation.patch rename to ports/bash/patches/0001-fix-non-multibyte-compilation.patch diff --git a/ports/bash/patches/0002-remove-cut-and-getconf-builtins.patch b/ports/bash/patches/0002-remove-cut-and-getconf-builtins.patch deleted file mode 100644 index db92aa4b..00000000 --- a/ports/bash/patches/0002-remove-cut-and-getconf-builtins.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN bash-5.2.37/examples/loadables/Makefile.in bash-5.2.37-banan_os/examples/loadables/Makefile.in ---- bash-5.2.37/examples/loadables/Makefile.in 2022-08-19 23:33:30.000000000 +0300 -+++ bash-5.2.37-banan_os/examples/loadables/Makefile.in 2025-01-26 02:43:36.121801845 +0200 -@@ -104,7 +104,7 @@ - ALLPROG = print truefalse sleep finfo logname basename dirname fdflags \ - tty pathchk tee head mkdir rmdir mkfifo mktemp printenv id whoami \ - uname sync push ln unlink realpath strftime mypid setpgid seq rm \ -- accept csv dsv cut stat getconf -+ accept csv dsv stat - OTHERPROG = necho hello cat pushd asort - - all: $(SHOBJ_STATUS)