Commit ebfc189c authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Upgraded bash to 5.1.8

parent 96096821
all: profile bash-completion dircolors extrapaths readline umask i18n bashrc locale-conf inputrc all: profile bash-completion dircolors extrapaths readline umask i18n bashrc locale-conf inputrc
tar xf bash-5.0.tar.gz tar xf bash-5.1.8.tar.gz
cd bash-5.0 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --docdir=/usr/share/doc/bash-5.0 --without-bash-malloc --with-installed-readline cd bash-5.1.8 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --docdir=/usr/share/doc/bash-5.1.8 --without-bash-malloc --with-installed-readline
$(MAKE) -C bash-5.0 $(MAKE) -C bash-5.1.8
if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \ if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
cd bash-5.0 ; \ cd bash-5.1.8 ; \
chown -Rv nobody . ; \ chown -Rv nobody . ; \
su nobody -s /bin/bash -c "PATH=$$PATH make tests" ; \ su nobody -s /bin/bash -c "PATH=$$PATH make tests" ; \
fi fi
$(MAKE) -C bash-5.0 install $(MAKE) -C bash-5.1.8 install
mv -vf /usr/bin/bash /bin mv -vf /usr/bin/bash /bin
@echo "$$PROFILE" > /etc/profile @echo "$$PROFILE" > /etc/profile
install --directory --mode=0755 --owner=root --group=root /etc/profile.d install --directory --mode=0755 --owner=root --group=root /etc/profile.d
...@@ -23,7 +23,7 @@ all: profile bash-completion dircolors extrapaths readline umask i18n bashrc loc ...@@ -23,7 +23,7 @@ all: profile bash-completion dircolors extrapaths readline umask i18n bashrc loc
dircolors -p > /etc/dircolors dircolors -p > /etc/dircolors
@echo "$$LOCALE_CONF" > /etc/locale.conf @echo "$$LOCALE_CONF" > /etc/locale.conf
@echo "$$INPUTRC" > /etc/inputrc @echo "$$INPUTRC" > /etc/inputrc
rm -rf bash-5.0 rm -rf bash-5.1.8
profile: profile:
define PROFILE define PROFILE
......
diff -uNr bash-5.0/configure bash-5.0-ncursesw_support/configure
--- bash-5.0/configure 2019-01-03 01:13:31.000000000 +1030
+++ bash-5.0-ncursesw_support/configure 2019-09-02 00:45:01.464542841 +0930
@@ -5290,6 +5290,9 @@
elif test $bash_cv_termcap_lib = libncurses; then
TERMCAP_LIB=-lncurses
TERMCAP_DEP=
+elif test $bash_cv_termcap_lib = libncursesw; then
+TERMCAP_LIB=-lncursesw
+TERMCAP_DEP=
elif test $bash_cv_termcap_lib = libc; then
TERMCAP_LIB=
TERMCAP_DEP=
@@ -16171,6 +16174,9 @@
elif test $bash_cv_termcap_lib = libncurses; then
TERMCAP_LIB=-lncurses
TERMCAP_DEP=
+elif test $bash_cv_termcap_lib = libncursesw; then
+TERMCAP_LIB=-lncursesw
+TERMCAP_DEP=
elif test $bash_cv_termcap_lib = libc; then
TERMCAP_LIB=
TERMCAP_DEP=
This source diff could not be displayed because it is too large. You can view the blob instead.
<project name="bash"> <project name="bash">
<target name="temporary-bash"> <target name="temporary-bash">
<property name="makedir" value="${builddir}/bash-5.0"/> <property name="makedir" value="${builddir}/bash-5.1.8"/>
<exec executable="tar" failonerror="true"> <exec executable="tar" failonerror="true">
<arg line="xf packages/bash/bash-5.0.tar.gz -C ${builddir}"/> <arg line="xf packages/bash/bash-5.1.8.tar.gz -C ${builddir}"/>
</exec> </exec>
<exec executable="patch" dir="${builddir}/bash-5.0" failonerror="true"> <exec executable="patch" dir="${builddir}/bash-5.1.8" failonerror="true">
<arg line="-Np1 -i ${basedir}/packages/bash/bash-5.0-ncursesw_support.patch"/> <arg line="-Np1 -i ${basedir}/packages/bash/bash-5.1.8-ncursesw_support.patch"/>
</exec> </exec>
<echo file="${makedir}/config.cache">ac_cv_func_mmap_fixed_mapped=yes <echo file="${makedir}/config.cache">ac_cv_func_mmap_fixed_mapped=yes
ac_cv_func_strcoll_works=yes ac_cv_func_strcoll_works=yes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment