From e82eda5befa8977c01e3a2e18b6905323b4dd7f4 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 14 May 2018 00:01:00 +0200 Subject: [PATCH] bash: don't link against the build systems readline library If we tell bash to used the installed readline library, it defaults to adding -L/lib for the readline and history library prefixes. This prepends the local systems search path to the toolchain search path and makes bash build break on some systems. Signed-off-by: David Oberhollenzer --- pkg/bash/0001.patch | 13 +++++++++++++ pkg/bash/build | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 pkg/bash/0001.patch diff --git a/pkg/bash/0001.patch b/pkg/bash/0001.patch new file mode 100644 index 0000000..40cfd9e --- /dev/null +++ b/pkg/bash/0001.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in.old b/Makefile.in +index c7b62bc..43859b1 100644 +--- a/Makefile.in.old ++++ b/Makefile.in +@@ -416,7 +416,7 @@ LIBRARIES = $(GLOB_LIB) $(SHLIB_LIB) $(READLINE_LIB) $(HISTORY_LIB) $(TERMCAP_LI + LIBDEP = $(GLOB_DEP) $(SHLIB_DEP) $(INTL_DEP) $(READLINE_DEP) $(HISTORY_DEP) $(TERMCAP_DEP) \ + $(TILDE_DEP) $(MALLOC_DEP) + +-LIBRARY_LDFLAGS = $(READLINE_LDFLAGS) $(HISTORY_LDFLAGS) $(GLOB_LDFLAGS) \ ++LIBRARY_LDFLAGS = $(GLOB_LDFLAGS) \ + $(TILDE_LDFLAGS) $(MALLOC_LDFLAGS) $(SHLIB_LDFLAGS) + + # diff --git a/pkg/bash/build b/pkg/bash/build index 6b264b3..4c60ba0 100755 --- a/pkg/bash/build +++ b/pkg/bash/build @@ -6,12 +6,12 @@ SHA256SUM="604d9eec5e4ed5fd2180ee44dd756ddca92e0b6aa4217bbab2b6227380317f23" DEPENDS="ncurses readline" prepare() { - return + apply_patches } build() { - $1/configure --prefix="" --host="$TARGET" --without-bash-malloc \ - --with-installed-readline + $1/configure --prefix="" --build="$HOSTTUPLE" --host="$TARGET" \ + --without-bash-malloc --with-installed-readline make -j $NUMJOBS }