testing/bash
SHA256
3
0
Fork 0
forked from pool/bash
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=95
This commit is contained in:
Dr. Werner Fink 2011-11-16 11:14:23 +00:00 committed by Git OBS Bridge
parent abdd0db0a2
commit b80565a997
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bash-4.2.dif
View File

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

7
bash.changes
View File

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

2
readline-6.2.dif
View File

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