mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 20:20:06 +02:00
bash: bump version to 4.4
This commit is contained in:
83
app-shells/bash/bash-4.4.recipe
Normal file
83
app-shells/bash/bash-4.4.recipe
Normal file
@@ -0,0 +1,83 @@
|
||||
SUMMARY="The GNU Bourne Again Shell"
|
||||
DESCRIPTION="Bash is an sh-compatible command language interpreter that \
|
||||
executes commands read from the standard input or from a file. Bash also \
|
||||
incorporates useful features from the Korn and C shells (ksh and csh)."
|
||||
HOMEPAGE="http://www.gnu.org/software/bash/"
|
||||
SOURCE_URI="https://ftp.gnu.org/gnu/bash/bash-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb"
|
||||
|
||||
PATCHES="
|
||||
bash-kill_by_name.patch
|
||||
bash-$portVersion.patch
|
||||
"
|
||||
SOURCE_DIR="bash-$portVersion"
|
||||
REVISION="1"
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1987-2016 Free Software Foundation, Inc."
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PROVIDES="
|
||||
bash = $portVersion
|
||||
cmd:bash = $portVersion
|
||||
cmd:bashbug = $portVersion
|
||||
cmd:sh
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku
|
||||
lib:libreadline
|
||||
lib:libncursesw
|
||||
lib:libintl
|
||||
lib:libiconv
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku_devel
|
||||
devel:libreadline
|
||||
devel:libncursesw
|
||||
devel:libintl
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:awk
|
||||
cmd:bison
|
||||
cmd:cmp
|
||||
cmd:gcc
|
||||
cmd:make
|
||||
cmd:patch
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="settings/bashrc keep-old"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
# store bash settings under ~/config/settings
|
||||
find -type f | xargs sed -i -e 's,~/\.,~/config/settings/,g'
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
CPPFLAGS="-DUSE_MKTEMP=1 -DUSE_MKSTEMP=1" runConfigure ./configure \
|
||||
--without-bash-malloc --with-installed-readline
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install-strip
|
||||
ln -s bash $binDir/sh
|
||||
|
||||
# Use bash-completion, if available
|
||||
cat <<'EOF' > $settingsDir/bashrc
|
||||
#!/bin/bash
|
||||
[[ $PS1 && -f /system/data/bash-completion/bash_completion ]] && \
|
||||
. /system/data/bash-completion/bash_completion
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
26
app-shells/bash/patches/bash-4.4.patch
Normal file
26
app-shells/bash/patches/bash-4.4.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
From 611873d530c23af9c679d43a4b3a30e59dd5eee4 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Sat, 17 Sep 2016 17:17:42 +0300
|
||||
Subject: [PATCH 1/1] fix gcc2 build
|
||||
|
||||
---
|
||||
shell.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/shell.c b/shell.c
|
||||
index 84f752b..4021475 100644
|
||||
--- a/shell.c
|
||||
+++ b/shell.c
|
||||
@@ -584,8 +584,8 @@ main (argc, argv, env)
|
||||
*/
|
||||
if (interactive_shell)
|
||||
{
|
||||
- char *term, *emacs, *inside_emacs;;
|
||||
int emacs_term, in_emacs;
|
||||
+ char *term, *emacs, *inside_emacs;;
|
||||
|
||||
term = get_string_value ("TERM");
|
||||
emacs = get_string_value ("EMACS");
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -86,8 +86,8 @@ index 2e68f03..7fa3191 100644
|
||||
- any_succeeded++;
|
||||
+ if (*word)
|
||||
+ {
|
||||
+ if (legal_number (list->word->word, &pid_value)
|
||||
+ && (pid_value == (pid_t)pid_value))
|
||||
+ if (legal_number (list->word->word, &pid_value)
|
||||
+ && (pid_value == (pid_t)pid_value))
|
||||
+ {
|
||||
+ pid = (pid_t) pid_value;
|
||||
+
|
||||
@@ -103,7 +103,7 @@ index 2e68f03..7fa3191 100644
|
||||
+ any_succeeded++;
|
||||
+ } else {
|
||||
+ errno = kill_by_name(sig, word);
|
||||
+ CONTINUE_OR_FAIL;
|
||||
+ CONTINUE_OR_FAIL;
|
||||
+ }
|
||||
}
|
||||
#if defined (JOB_CONTROL)
|
||||
|
||||
Reference in New Issue
Block a user