!44 [Sync] Sync from 22.03-LTS-SP3

From: @lesleyzheng1103 
Reviewed-by: @li-yancheng 
Signed-off-by: @li-yancheng
This commit is contained in:
openeuler-ci-bot 2024-06-06 12:23:30 +00:00 committed by Gitee
commit f059a694f3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 23 additions and 14 deletions

View File

@ -5,6 +5,7 @@ readonly LIB_PATH="$PWD/../open_source"
source $PWD/config.xml source $PWD/config.xml
build_rpmdir=`rpm --eval "%{_builddir}"` build_rpmdir=`rpm --eval "%{_builddir}"`
src_rpmdir=`rpm --eval "%{_sourcedir}"` src_rpmdir=`rpm --eval "%{_sourcedir}"`
SRC_BRANCH="openEuler-22.03-LTS-SP4"
#judge the open_source #judge the open_source
@ -33,25 +34,25 @@ function do_patch() {
fi fi
popd popd
} }
echo "Download $GCC" && git clone -b openEuler-22.03-LTS-Next https://gitee.com/src-openeuler/gcc.git echo "Download $GCC" && git clone -b $SRC_BRANCH https://gitee.com/src-openeuler/gcc.git
do_patch $GCC do_patch $GCC
echo "Download $GLIBC" && git clone -b openEuler-22.03-LTS-Next https://gitee.com/src-openeuler/glibc.git echo "Download $GLIBC" && git clone -b $SRC_BRANCH https://gitee.com/src-openeuler/glibc.git
do_patch $GLIBC do_patch $GLIBC
echo "Download $BINUTILS" && git clone -b openEuler-22.03-LTS-Next https://gitee.com/src-openeuler/binutils.git echo "Download $BINUTILS" && git clone -b $SRC_BRANCH https://gitee.com/src-openeuler/binutils.git
do_patch $BINUTILS do_patch $BINUTILS
echo "Download $GMP" && git clone -b openEuler-22.03-LTS-Next https://gitee.com/src-openeuler/gmp.git echo "Download $GMP" && git clone -b $SRC_BRANCH https://gitee.com/src-openeuler/gmp.git
do_patch $GMP do_patch $GMP
echo "Download $MPFR" && git clone -b openEuler-22.03-LTS-Next https://gitee.com/src-openeuler/mpfr.git echo "Download $MPFR" && git clone -b $SRC_BRANCH https://gitee.com/src-openeuler/mpfr.git
do_patch $MPFR do_patch $MPFR
echo "Download $MPC" && git clone -b openEuler-22.03-LTS-Next https://gitee.com/src-openeuler/libmpc.git echo "Download $MPC" && git clone -b $SRC_BRANCH https://gitee.com/src-openeuler/libmpc.git
do_patch $MPC do_patch $MPC
echo "Download $ISL" && git clone -b openEuler-22.03-LTS-Next https://gitee.com/src-openeuler/isl.git echo "Download $ISL" && git clone -b $SRC_BRANCH https://gitee.com/src-openeuler/isl.git
do_patch $ISL do_patch $ISL
echo "Download $LINUX_KERNEL" && git clone -b 5.10.0-60.16.0 https://gitee.com/openeuler/kernel.git --depth 1 echo "Download $LINUX_KERNEL" && git clone -b 5.10.0-60.16.0 https://gitee.com/openeuler/kernel.git --depth 1

View File

@ -1,7 +1,7 @@
Summary: C/C++ Cross Compiler Toolchain Summary: C/C++ Cross Compiler Toolchain
Name: gcc-cross Name: gcc-cross
Version: 1.0 Version: 1.0
Release: 5 Release: 7
# libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have
# GCC Runtime Exception. # GCC Runtime Exception.
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@ -42,6 +42,18 @@ cp %{_builddir}/output/gcc_arm32le/gcc_arm32le.tar.gz %{buildroot}/tmp
%attr(755, root, root) /tmp/gcc_arm32le.tar.gz %attr(755, root, root) /tmp/gcc_arm32le.tar.gz
%changelog %changelog
* Thu Nov 30 2023 zhengchenhui <zhengchenhui1@huawei.com> - 1.0-7
-Type:Fix
-ID:NA
-SUG:NA
-DESC: Fix the compilation problem caused by the missing code segment of crtbeginS.o
* Thu Nov 30 2023 zhengchenhui <zhengchenhui1@huawei.com> - 1.0-6
-Type:Fix
-ID:NA
-SUG:NA
-DESC: Fix cross-compilation tool chain to openEuler-22.03-LTS-SP3
* Tue Apr 25 2023 dingguangya <dingguangya1@huawei.com> - 1.0-5 * Tue Apr 25 2023 dingguangya <dingguangya1@huawei.com> - 1.0-5
-Type:Fix -Type:Fix
-ID:NA -ID:NA

View File

@ -109,10 +109,8 @@ for file in $(find "$PREFIX" -name "*") ; do
if [[ $get_arch =~ "x86_64" ]] if [[ $get_arch =~ "x86_64" ]]
then then
res1=$(echo $result | grep "ARM" | cat) res1=$(echo $result | grep "ARM" | cat)
if [[ "$res1" != "" ]] if [[ "$res1" == "" ]]
then then
$PREFIX/bin/$TARGET-strip $file
else
strip $file strip $file
fi fi
else else

View File

@ -111,10 +111,8 @@ for file in $(find "$PREFIX" -name "*") ; do
if [[ $get_arch =~ "x86_64" ]] if [[ $get_arch =~ "x86_64" ]]
then then
res1=$(echo $result | grep "ARM" | cat) res1=$(echo $result | grep "ARM" | cat)
if [[ "$res1" != "" ]] if [[ "$res1" == "" ]]
then then
$PREFIX/bin/$TARGET-strip $file
else
strip $file strip $file
fi fi
else else