From dd8c293ab2420f71758d222af4e3217b33d0f806 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 16 Nov 2011 11:14:23 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=95 --- bash-4.2.dif | 4 ++-- bash.changes | 7 +++++++ readline-6.2.dif | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bash-4.2.dif b/bash-4.2.dif index 6f360d20..498fec32 100644 --- a/bash-4.2.dif +++ b/bash-4.2.dif @@ -195,7 +195,7 @@ +RL_INCDIR=/usr/include -TERMCAP_LIB="-ltermcap" -+TERMCAP_LIB="-lncurses" ++echo 'int main () { return 0; }' | gcc -ltinfo -o /dev/null -xc - > /dev/null 2>&1 && TERMCAP_LIB="-ltinfo" || TERMCAP_LIB="-lncurses" # cannot rely on the presence of getopts while [ $# -gt 0 ]; do @@ -211,7 +211,7 @@ - SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' -+ SHLIB_LIBS=-lncurses ++ echo 'int main () { return 0; }' | gcc -ltinfo -o /dev/null -xc - > /dev/null 2>&1 && SHLIB_LIBS=-ltinfo || SHLIB_LIBS=-lncurses ;; freebsd2*) diff --git a/bash.changes b/bash.changes index a362fb16..60286513 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 16 11:11:21 UTC 2011 - werner@suse.de + +- Use libtinfo if available otherwise libncurses, this avoids + linkage against libncursesw of libreadline (required due + bnc #729226) + ------------------------------------------------------------------- Fri Nov 11 15:27:12 UTC 2011 - werner@suse.de diff --git a/readline-6.2.dif b/readline-6.2.dif index b1cf1732..8c7dd157 100644 --- a/readline-6.2.dif +++ b/readline-6.2.dif @@ -125,7 +125,7 @@ - SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' -+ SHLIB_LIBS=-lncurses ++ echo 'int main () { return 0; }' | gcc -ltinfo -o /dev/null -xc - > /dev/null 2>&1 && SHLIB_LIBS=-ltinfo || SHLIB_LIBS=-lncurses ;; freebsd2*)