.
OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=98
This commit is contained in:
parent
b80565a997
commit
32aa646d84
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 18 12:03:56 UTC 2011 - werner@suse.de
|
||||||
|
|
||||||
|
- Enforce bind references to global function symbols to the
|
||||||
|
definition within libreadline
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 16 11:11:21 UTC 2011 - werner@suse.de
|
Wed Nov 16 11:11:21 UTC 2011 - werner@suse.de
|
||||||
|
|
||||||
|
16
bash.spec
16
bash.spec
@ -326,15 +326,13 @@ pushd ../readline-%{rl_vers}%{extend}
|
|||||||
case "${!var}" in
|
case "${!var}" in
|
||||||
*${flag}*) return
|
*${flag}*) return
|
||||||
esac
|
esac
|
||||||
|
set -o noclobber
|
||||||
case "$flag" in
|
case "$flag" in
|
||||||
-Wl,*)
|
-Wl,*)
|
||||||
set -o noclobber
|
if echo 'int main () { return 0; }' | \
|
||||||
echo 'int main () { return 0; }' > ldtest.c
|
${CC:-gcc} -Werror $flag -o /dev/null -xc - > /dev/null 2>&1 ; then
|
||||||
if ${CC:-gcc} -Werror $flag -o /dev/null -xc ldtest.c > /dev/null 2>&1 ; then
|
|
||||||
eval $var=\${$var:+\$$var\ }$flag
|
eval $var=\${$var:+\$$var\ }$flag
|
||||||
fi
|
fi
|
||||||
set +o noclobber
|
|
||||||
rm -f ldtest.c
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
if ${CC:-gcc} -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
|
if ${CC:-gcc} -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
|
||||||
@ -344,6 +342,7 @@ pushd ../readline-%{rl_vers}%{extend}
|
|||||||
eval $var=\${$var:+\$$var\ }$flag
|
eval $var=\${$var:+\$$var\ }$flag
|
||||||
fi
|
fi
|
||||||
esac
|
esac
|
||||||
|
set +o noclobber
|
||||||
}
|
}
|
||||||
echo 'int main () { return !(sizeof(void*) >= 8); }' | gcc -x c -o test64 -
|
echo 'int main () { return !(sizeof(void*) >= 8); }' | gcc -x c -o test64 -
|
||||||
if ./test64 ; then
|
if ./test64 ; then
|
||||||
@ -365,7 +364,8 @@ pushd ../readline-%{rl_vers}%{extend}
|
|||||||
cflags -pipe CFLAGS
|
cflags -pipe CFLAGS
|
||||||
cflags -Wl,--as-needed LDFLAGS
|
cflags -Wl,--as-needed LDFLAGS
|
||||||
cflags -Wl,-O2 LDFLAGS
|
cflags -Wl,-O2 LDFLAGS
|
||||||
cflags -Wl,--hash-size=16699 LDFLAGS
|
cflags -Wl,--hash-size=8599 LDFLAGS
|
||||||
|
cflags -Wl,-Bsymbolic-functions LDFLAGS
|
||||||
cflags -Wl,-rpath,%{_ldldir}/%{bash_vers} LDFLAGS
|
cflags -Wl,-rpath,%{_ldldir}/%{bash_vers} LDFLAGS
|
||||||
CC=gcc
|
CC=gcc
|
||||||
CC_FOR_BUILD="$CC"
|
CC_FOR_BUILD="$CC"
|
||||||
@ -388,7 +388,9 @@ 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
|
||||||
export LD_LIBRARY_PATH=$PWD/../readline-%{rl_vers}
|
LD_LIBRARY_PATH=$PWD/../readline-%{rl_vers}
|
||||||
|
export LD_LIBRARY_PATH
|
||||||
|
LDFLAGS="${LDFLAGS/hash-size=8599/hash-size=16699}"
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user