diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 9f291d82e..aad22e203 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -1,4 +1,8 @@ +*) 2003-09-26 (2.0.0-rc1 - 2.0.0-rc2) + + - Dimitar Zhekov: bash use installed readline option + *) 2003-09-24 (2.0.0-rc1 - 2.0.0-rc2) - Alejandro Mery: fixed python patch diff --git a/package/base/bash/bash.conf b/package/base/bash/bash.conf index e89db613b..22bc5fc6b 100644 --- a/package/base/bash/bash.conf +++ b/package/base/bash/bash.conf @@ -28,9 +28,10 @@ pkg_bash_postmake() { mv -v $root/usr/bin/bash $root/bin/bash ln -sfv bash $root/bin/sh - echo "Installing bash documentation ..." - tar $taropt $archdir/bash-doc-$pkg_bash_docver.tar.bz2 - cp -rv doc/* $docdir + if [ "$ROCKCFG_CREATE_DOCS" != 0 ] ; then + echo "Unpacking bash documentation ..." + tar $taropt $archdir/bash-doc-$pkg_bash_docver.tar.bz2 + fi } premake="cat /dev/null > lib/malloc/malloc.c" @@ -38,6 +39,9 @@ confopt="$confopt --without-gnu-malloc" if [ $stagelevel -le 1 ] ; then confopt="$confopt --disable-readline" +elif [ "$ROCKCFG_PKG_BASH_INST_RLL" = 1 ] ; then + preconf="patch -p0 < $confdir/dont-link-history.diff" + confopt="$confopt --with-installed-readline" fi [ "$ROCKCFG_PKG_BASH_PROGCOMP" = 0 ] && confopt="$confopt --disable-progcomp" [ "$ROCKCFG_PKG_BASH_HELP_CMD" = 0 ] && confopt="$confopt --disable-help-builtin" diff --git a/package/base/bash/config.hlp b/package/base/bash/config.hlp index 8b448be45..35cd58bed 100644 --- a/package/base/bash/config.hlp +++ b/package/base/bash/config.hlp @@ -33,5 +33,11 @@ ROCKCFG_PKG_BASH_HELP_CMD Bourne Again Shell has builtin help for all internal commands. You can disable this feature and reduce the size of bash by about 50KB, but if your target contains no bash documentation, as for example - bootdisk, you will have no help for the shell commands. If you are - not terribly low of disk space, leave the builtin help enabled. + bootdisk, you will not have any help for the shell commands. If you + are not terribly low of disk space, leave the builtin help enabled. + +ROCKCFG_PKG_BASH_INST_RLL + Build bash with the (already) installed readline library, not with + the one included in bash. Note that bash will be linked against the + shared readline library (if any), which will be moved from /usr/lib + to /lib. Don't change this option after readline has been build. diff --git a/package/base/bash/config.in b/package/base/bash/config.in index f9d061c01..7ed4b0b26 100644 --- a/package/base/bash/config.in +++ b/package/base/bash/config.in @@ -24,5 +24,6 @@ menu_begin MENU_PKG_BASH 'Bash Options' bool 'Enable programmable completion' ROCKCFG_PKG_BASH_PROGCOMP 1 bool 'Enable help builtin command' ROCKCFG_PKG_BASH_HELP_CMD 1 +bool 'Build with installed readline' ROCKCFG_PKG_BASH_INST_RLL 0 menu_end diff --git a/package/base/bash/dont-link-history.diff b/package/base/bash/dont-link-history.diff new file mode 100644 index 000000000..5f7213bde --- /dev/null +++ b/package/base/bash/dont-link-history.diff @@ -0,0 +1,15 @@ +--- ./Makefile.in.orig 2002-05-31 20:44:23.000000000 +0300 ++++ ./Makefile.in 2003-09-22 14:53:13.000000000 +0300 +@@ -340,10 +340,10 @@ + $(BASHINCDIR)/shtty.h $(BASHINCDIR)/typemax.h \ + $(BASHINCDIR)/ocache.h + +-LIBRARIES = $(SHLIB_LIB) $(READLINE_LIB) $(HISTORY_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \ ++LIBRARIES = $(SHLIB_LIB) $(READLINE_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \ + $(TILDE_LIB) $(MALLOC_LIB) $(LOCAL_LIBS) + +-LIBDEP = $(SHLIB_DEP) $(READLINE_DEP) $(HISTORY_DEP) $(TERMCAP_DEP) $(GLOB_DEP) \ ++LIBDEP = $(SHLIB_DEP) $(READLINE_DEP) $(TERMCAP_DEP) $(GLOB_DEP) \ + $(TILDE_DEP) $(MALLOC_DEP) + + LIBRARY_LDFLAGS = $(READLINE_LDFLAGS) $(HISTORY_LDFLAGS) $(GLOB_LDFLAGS) \ diff --git a/target/bootdisk/config.in b/target/bootdisk/config.in index f7867fbbe..ab977ff13 100644 --- a/target/bootdisk/config.in +++ b/target/bootdisk/config.in @@ -77,6 +77,7 @@ ROCKCFGSET_DIETLIBC_iproute2=1 ROCKCFGSET_PKG_TERMCAP_USEIT=1 ROCKCFGSET_PKG_GCC3_NO_JAVA=1 ROCKCFGSET_PKG_BASH_PROGCOMP=0 +ROCKCFGSET_PKG_BASH_INST_RLL=0 ROCKCFGSET_DO_REBUILD_STAGE=0 ROCKCFGSET_CREATE_DOCS=0