1
0
Fork 0
mirror of https://github.com/pygos/build.git synced 2024-06-18 09:20:12 +02:00

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 <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-05-14 00:01:00 +02:00
parent 8d9e25b8d0
commit e82eda5bef
2 changed files with 16 additions and 3 deletions

13
pkg/bash/0001.patch Normal file
View file

@ -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)
#

View file

@ -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
}