Skip to content

Commit 425082f

Browse files
authored
Merge pull request #40 from robxu9/robxu9-5.2
Upgrade to 5.2, include musl FTBFS patch from Debian
2 parents c43d0a1 + da4d94b commit 425082f

3 files changed

Lines changed: 21 additions & 1 deletion

File tree

build.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
set -e
2828
set -o pipefail
29+
shopt -s nullglob
2930

3031
# load version info
3132
# shellcheck source=./version.sh
@@ -82,6 +83,14 @@ for lvl in $(seq 1 $bash_patch_level); do
8283
popd
8384
done
8485

86+
echo "= patching with any custom patches we have"
87+
for i in ../custom/*.patch; do
88+
echo $i
89+
pushd bash-${bash_version}
90+
patch -p1 < ../"$i"
91+
popd
92+
done
93+
8594
configure_args=()
8695

8796
if [ "$target" = "linux" ]; then
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/m4/strtoimax.m4
2+
+++ b/m4/strtoimax.m4
3+
@@ -29,7 +29,7 @@
4+
fi
5+
])
6+
AC_MSG_RESULT($bash_cv_func_strtoimax)
7+
-if test $bash_cv_func_strtoimax = yes; then
8+
+if test $bash_cv_func_strtoimax = no; then
9+
AC_LIBOBJ(strtoimax)
10+
fi
11+
])

version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
bash_version="5.2"
4-
bash_patch_level=0
4+
bash_patch_level=15
55
musl_version="1.2.3"
66

77
export bash_version

0 commit comments

Comments
 (0)