From 3b124b89394a358327eafaea86d6cde9d0d453d3 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 3 Sep 2004 14:25:55 +0000 Subject: [PATCH] Stefan Fiedler: patch bash 3.0 in stage 1 to find missing readline symbols Index: package/base/bash/bash.conf =================================================================== [2004083023232017578] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3999 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/bash/bash.conf | 2 +- package/base/bash/readline.diff | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 package/base/bash/readline.diff diff --git a/package/base/bash/bash.conf b/package/base/bash/bash.conf index 9ceaf6928..278518a62 100644 --- a/package/base/bash/bash.conf +++ b/package/base/bash/bash.conf @@ -37,7 +37,7 @@ pkg_bash_postmake() { premake="cat /dev/null > lib/malloc/malloc.c" confopt="$confopt --without-gnu-malloc" -[ $stagelevel -eq 1 ] && confopt="$confopt --disable-readline" +[ $stagelevel -eq 1 ] && var_append patchfiles " " "$confdir/readline.diff" [ "$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/readline.diff b/package/base/bash/readline.diff new file mode 100644 index 000000000..b6a5ab89e --- /dev/null +++ b/package/base/bash/readline.diff @@ -0,0 +1,11 @@ +--- bash-3.0/Makefile.in 2004-08-25 22:53:21.000000000 +0200 ++++ bash-3.0/Makefile.in.patch 2004-08-25 22:51:33.000000000 +0200 +@@ -511,7 +511,7 @@ + + $(Program): .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP) + $(RM) $@ +- $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) ++ $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(READLINE_LIBRARY) + ls -l $(Program) + + .build: $(SOURCES) config.h Makefile version.h $(VERSPROG)