From d1f064d907148b408c320c352cdf3a16db847974 Mon Sep 17 00:00:00 2001 From: Qian Li Date: Thu, 11 Apr 2024 17:53:20 +0800 Subject: [PATCH 1/4] fix spec files are packaged in src.rpm without source code files --- gcc-cross.spec | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/gcc-cross.spec b/gcc-cross.spec index 950865f..43474b7 100644 --- a/gcc-cross.spec +++ b/gcc-cross.spec @@ -1,7 +1,7 @@ Summary: C/C++ Cross Compiler Toolchain Name: gcc-cross Version: 1.0 -Release: 9 +Release: 7 # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -9,8 +9,8 @@ URL: http://gcc.gnu.org Source0: build.sh Source1: config.xml Source2: download.sh -Source3: gcc_arm32le.tar.gz -Source4: gcc_arm64le.tar.gz +Source3: gcc_arm32le +Source4: gcc_arm64le Source5: README.en.md BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -88,23 +88,12 @@ cp %{_builddir}/output/gcc_arm32le/gcc_arm32le.tar.gz %{buildroot}/tmp %attr(755, root, root) /tmp/gcc_arm32le.tar.gz %changelog -* Tue Jun 3 2025 zhengchenhui - 1.0-9 --Type:Refactor --ID:NA --SUG:NA --DESC: Dynamically set SRC_BRANCH from git. - -* Thu Feb 20 2025 zhengchenhui - 1.0-8 --Type:Fix --ID:NA --SUG:NA --DESC: Fix src.rpm build error. - -* Tue Feb 11 2025 zhengchenhui - 1.0-7 +* Thu Apr 11 2024 liqian - 1.0-7 -Type:Fix -ID:NA -SUG:NA --DESC: Fix binutils download error. +-DESC: Fix Only the spec file is packaged in src.rpm without the source code file, + so it cannot be directly decompressed and compiled using src.rpm * Mon Mar 11 2024 zhengchenhui - 1.0-6 -Type:Fix -- Gitee From db081d7567fa327cab7e47538223729f32b0da5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=99=A8=E5=8D=89?= Date: Mon, 9 Dec 2024 14:49:58 +0800 Subject: [PATCH 2/4] Fix src.rpm build error. --- gcc-cross.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc-cross.spec b/gcc-cross.spec index 43474b7..557b6bf 100644 --- a/gcc-cross.spec +++ b/gcc-cross.spec @@ -1,7 +1,7 @@ Summary: C/C++ Cross Compiler Toolchain Name: gcc-cross Version: 1.0 -Release: 7 +Release: 8 # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -9,8 +9,8 @@ URL: http://gcc.gnu.org Source0: build.sh Source1: config.xml Source2: download.sh -Source3: gcc_arm32le -Source4: gcc_arm64le +Source3: gcc_arm32le.tar.gz +Source4: gcc_arm64le.tar.gz Source5: README.en.md BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -88,6 +88,12 @@ cp %{_builddir}/output/gcc_arm32le/gcc_arm32le.tar.gz %{buildroot}/tmp %attr(755, root, root) /tmp/gcc_arm32le.tar.gz %changelog +* Mon Dec 9 2024 zhengchenhui - 1.0-8 +-Type:Fix +-ID:NA +-SUG:NA +-DESC: Fix src.rpm build error. + * Thu Apr 11 2024 liqian - 1.0-7 -Type:Fix -ID:NA -- Gitee From 10f4749551c35ec1310a43d1aadd743623471ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=99=A8=E5=8D=89?= Date: Wed, 2 Apr 2025 11:43:17 +0800 Subject: [PATCH 3/4] Fix binutils download error. --- download.sh | 4 ++-- gcc-cross.spec | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/download.sh b/download.sh index da86fbf..2f9e13f 100755 --- a/download.sh +++ b/download.sh @@ -19,8 +19,8 @@ cd $LIB_PATH && delete_dir $GCC $BINUTILS $GMP $MPC $MPFR $ISL pushd $LIB_PATH function do_patch() { pushd $1 - git lfs install - git lfs pull + git lfs install + git lfs pull cp -f * $src_rpmdir specfile=`ls *.spec` rpmbuild -bp $src_rpmdir/$specfile diff --git a/gcc-cross.spec b/gcc-cross.spec index 557b6bf..512ab61 100644 --- a/gcc-cross.spec +++ b/gcc-cross.spec @@ -1,7 +1,7 @@ Summary: C/C++ Cross Compiler Toolchain Name: gcc-cross Version: 1.0 -Release: 8 +Release: 9 # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -88,6 +88,12 @@ cp %{_builddir}/output/gcc_arm32le/gcc_arm32le.tar.gz %{buildroot}/tmp %attr(755, root, root) /tmp/gcc_arm32le.tar.gz %changelog +* Wed Apr 2 2025 zhengchenhui - 1.0-9 +-Type:Fix +-ID:NA +-SUG:NA +-DESC: Fix binutils download error. + * Mon Dec 9 2024 zhengchenhui - 1.0-8 -Type:Fix -ID:NA -- Gitee From fd942d289ce467eb8c52a36b6667f21fb9e4b47b Mon Sep 17 00:00:00 2001 From: zhengchenhui Date: Fri, 29 Aug 2025 11:06:03 +0800 Subject: [PATCH 4/4] Dynamically set SRC_BRANCH from git. --- download.sh | 2 ++ gcc-cross.spec | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/download.sh b/download.sh index 2f9e13f..77f4cc4 100755 --- a/download.sh +++ b/download.sh @@ -7,6 +7,8 @@ build_rpmdir=`rpm --eval "%{_builddir}"` src_rpmdir=`rpm --eval "%{_sourcedir}"` echo $SRC_BRANCH +#judge the open_source + [ ! -d "$LIB_PATH" ] && mkdir $LIB_PATH function delete_dir() { diff --git a/gcc-cross.spec b/gcc-cross.spec index 512ab61..6d8770e 100644 --- a/gcc-cross.spec +++ b/gcc-cross.spec @@ -1,7 +1,7 @@ Summary: C/C++ Cross Compiler Toolchain Name: gcc-cross Version: 1.0 -Release: 9 +Release: 10 # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -88,6 +88,12 @@ cp %{_builddir}/output/gcc_arm32le/gcc_arm32le.tar.gz %{buildroot}/tmp %attr(755, root, root) /tmp/gcc_arm32le.tar.gz %changelog +* Fri Aug 29 2025 zhengchenhui - 1.0-10 +-Type:Refactor +-ID:NA +-SUG:NA +-DESC: Dynamically set SRC_BRANCH from git. + * Wed Apr 2 2025 zhengchenhui - 1.0-9 -Type:Fix -ID:NA -- Gitee