alexlau/bash-custom-action
1
0
Fork 0
Code Pull Requests Actions Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=221
This commit is contained in:
Dr. Werner Fink 2016-10-21 12:25:30 +00:00 committed by Git OBS Bridge
parent 4ea4fdf26b
commit d34d66e357
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bash.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 4 12:59:48 UTC 2016 - werner@suse.de
- Avoid confusing library path
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 16 10:41:30 UTC 2016 - werner@suse.de Fri Sep 16 10:41:30 UTC 2016 - werner@suse.de

6
bash.spec
View File

@ -449,8 +449,8 @@ popd
# /proc is required for correct configuration # /proc is required for correct configuration
test -d /dev/fd || { echo "/proc is not mounted!" >&2; exit 1; } test -d /dev/fd || { echo "/proc is not mounted!" >&2; exit 1; }
ln -sf ../readline-%{rl_vers} readline ln -sf ../readline-%{rl_vers} readline
LD_LIBRARY_PATH=$PWD/../readline-%{rl_vers} LD_RUN_PATH=$PWD/../readline-%{rl_vers}
export LD_LIBRARY_PATH export LD_RUN_PATH
CC="gcc -I$PWD -L$PWD/../readline-%{rl_vers}" CC="gcc -I$PWD -L$PWD/../readline-%{rl_vers}"
%if %_minsh %if %_minsh
cflags -Os CFLAGS cflags -Os CFLAGS
@ -543,7 +543,7 @@ popd
TMPDIR=$(mktemp -d /tmp/bash.XXXXXXXXXX) || exit 1 TMPDIR=$(mktemp -d /tmp/bash.XXXXXXXXXX) || exit 1
> $SCREENLOG > $SCREENLOG
tail -q -s 0.5 -f $SCREENLOG & pid=$! tail -q -s 0.5 -f $SCREENLOG & pid=$!
env -i HOME=$PWD TERM=$TERM LD_LIBRARY_PATH=$LD_LIBRARY_PATH TMPDIR=$TMPDIR \ env -i HOME=$PWD TERM=$TERM LD_LIBRARY_PATH=$LD_RUN_PATH TMPDIR=$TMPDIR \
SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \ SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \
screen -L -D -m make TESTSCRIPT=%{SOURCE4} check screen -L -D -m make TESTSCRIPT=%{SOURCE4} check
kill -TERM $pid kill -TERM $pid