!999 [sync] PR-995: glibc testcase use newly built ld.so instead of environment default installed ld.so
From: @openeuler-sync-bot Reviewed-by: @liqingqing_1229 Signed-off-by: @liqingqing_1229
This commit is contained in:
commit
2b4695acd8
10
glibc.spec
10
glibc.spec
@ -67,7 +67,7 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
Name: glibc
|
Name: glibc
|
||||||
Version: 2.38
|
Version: 2.38
|
||||||
Release: 53
|
Release: 54
|
||||||
Summary: The GNU libc libraries
|
Summary: The GNU libc libraries
|
||||||
License: %{all_license}
|
License: %{all_license}
|
||||||
URL: http://www.gnu.org/software/glibc/
|
URL: http://www.gnu.org/software/glibc/
|
||||||
@ -648,6 +648,7 @@ mkdir $builddir
|
|||||||
pushd $builddir
|
pushd $builddir
|
||||||
../configure CC="%GCC" CXX="%GXX" CFLAGS="$BuildFlags" LDFLAGS="$LinkFlags" \
|
../configure CC="%GCC" CXX="%GXX" CFLAGS="$BuildFlags" LDFLAGS="$LinkFlags" \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
|
--enable-hardcoded-path-in-tests \
|
||||||
--with-headers=%{_prefix}/include $EnableKernel \
|
--with-headers=%{_prefix}/include $EnableKernel \
|
||||||
--with-nonshared-cflags=-Wp,-D_FORTIFY_SOURCE=2 \
|
--with-nonshared-cflags=-Wp,-D_FORTIFY_SOURCE=2 \
|
||||||
--enable-bind-now \
|
--enable-bind-now \
|
||||||
@ -1087,7 +1088,9 @@ function removeLoadPath()
|
|||||||
currPath=$(echo $runpathInfo | awk -F "RUNPATH=" '{print $2}')
|
currPath=$(echo $runpathInfo | awk -F "RUNPATH=" '{print $2}')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ x"$currPath" == x"\$ORIGIN" ]; then
|
# 2dcaf7064 using rpath instead of runpath with --enable-hardcoded-path-in-tests
|
||||||
|
# using "\$ORIGIN"* to match rpath address
|
||||||
|
if [[ x"$currPath" == x"\$ORIGIN"* ]]; then
|
||||||
chrpath -d $file
|
chrpath -d $file
|
||||||
|
|
||||||
findReliantLib $file
|
findReliantLib $file
|
||||||
@ -1488,6 +1491,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 18 2025 shixuantong <shixuantong1@huawei.com> - 2.38-54
|
||||||
|
- glibc testcase use newly built ld.so instead of environment default installed ld.so
|
||||||
|
|
||||||
* Thu Feb 06 2025 shixuantong <shixuantong1@huawei.com> - 2.38-53
|
* Thu Feb 06 2025 shixuantong <shixuantong1@huawei.com> - 2.38-53
|
||||||
- fix CVE-2019-1010023
|
- fix CVE-2019-1010023
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user