Merge branch 'bash-fix' into 'master'

Fix compiling readline and bash for i586

See merge request redox-os/redox!2194
This commit is contained in:
Wildan Mubarok 2026-06-15 14:45:06 +00:00
commit 6031761dcc
2 changed files with 5 additions and 0 deletions

View File

@ -12,8 +12,10 @@ DYNAMIC_INIT
cookbook_configure
OS=$(echo "${TARGET}" | cut -d - -f3)
if [ "${OS}" = "redox" ]; then
if [ "${COOKBOOK_DYNAMIC}" = "1" ]; then
ln -s "libhistory.so.8" "${COOKBOOK_STAGE}"/usr/lib/libhistory.so
ln -s "libreadline.so.8" "${COOKBOOK_STAGE}"/usr/lib/libreadline.so
patchelf --add-needed libncursesw.so "${COOKBOOK_STAGE}/usr/lib/libreadline.so.8"
fi
fi
"""

View File

@ -9,12 +9,15 @@ dependencies = [
]
script = """
DYNAMIC_INIT
export CPPFLAGS+=" -DHAVE_STRCHRNUL"
COOKBOOK_CONFIGURE_FLAGS+=(
bash_cv_func_sigsetjmp=no
ac_cv_func_getrlimit=no
ac_cv_func_dlopen=no
ac_cv_func_dlclose=no
bash_cv_getenv_redef=no
bash_cv_getcwd_malloc=yes
bash_cv_func_strchrnul_works=yes
--with-bash-malloc=no
--with-installed-readline=yes
)