From a12560c6c640e1a4d43ed9338f6bc26276ef1dd1 Mon Sep 17 00:00:00 2001 From: Xiong Zhou Date: Tue, 27 Dec 2022 19:58:56 +0800 Subject: [PATCH] fixed 9efed30 from https://gitee.com/xiongzhou4/gcc-for-openEuler_src/pulls/10 [gcc-for-openEuler] Adapt the package for openEuler-22.03-LTS-SP1. --- ...e-branch-name-for-optimized-routines.patch | 27 +++++++++++++++++++ config.xml | 2 +- gcc-for-openEuler.spec | 9 +++++-- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 0001-Change-branch-name-for-optimized-routines.patch diff --git a/0001-Change-branch-name-for-optimized-routines.patch b/0001-Change-branch-name-for-optimized-routines.patch new file mode 100644 index 0000000..cad62ba --- /dev/null +++ b/0001-Change-branch-name-for-optimized-routines.patch @@ -0,0 +1,27 @@ +From 8af2d0dadcd5ae3fe3366d7d4c46f1f710dae458 Mon Sep 17 00:00:00 2001 +From: Xiong Zhou +Date: Tue, 27 Dec 2022 16:00:13 +0800 +Subject: [PATCH] [gcc-for-openEuler] Change branch name for + optimized-routines. + +--- + build/download.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build/download.sh b/build/download.sh +index a1e1b66..d11fe6e 100644 +--- a/build/download.sh ++++ b/build/download.sh +@@ -37,7 +37,8 @@ download $GMP_NAME + download $MPC_NAME + download $MPFR_NAME + download $ISL_NAME +-download $MATHLIB_NAME ++[ -d "$MATHLIB_NAME" ] && rm -rf $MATHLIB_NAME ++echo "Download $MATHLIB_NAME" && git clone -b openEuler-22.03-LTS-Next-release-20221227 https://gitee.com/src-openeuler/$MATHLIB_NAME.git + download $JEMALLOC_NAME + download $AUTOFDO_NAME + download $BOLT_NAME +-- +2.33.0 + diff --git a/config.xml b/config.xml index cc53fbc..400be4f 100644 --- a/config.xml +++ b/config.xml @@ -1,4 +1,4 @@ -BRANCH="openEuler-22.03-LTS-Next" +BRANCH="openEuler-22.03-LTS-SP1-release" INSTALL_NATIVE="gcc-10.3.1-2022.12-aarch64-linux" COMPILER_INFO="gcc for openEuler 2.3.3" diff --git a/gcc-for-openEuler.spec b/gcc-for-openEuler.spec index d1aab4f..651e2b6 100644 --- a/gcc-for-openEuler.spec +++ b/gcc-for-openEuler.spec @@ -1,6 +1,6 @@ Name: gcc-for-openEuler Version: 1.0.4 -Release: 6 +Release: 7 Summary: GCC released as a binary package for openEuler and other OSes. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2 and BSD @@ -15,6 +15,8 @@ ExclusiveArch: aarch64 BuildRequires: git bison flex texinfo autoconf libtool elfutils-libelf-devel glibc-static BuildRequires: chrpath centos-release-scl devtoolset-7 python3 zlib-devel lksctp-tools-devel +Patch1: 0001-Change-branch-name-for-optimized-routines.patch + %description GCC released as a binary package for openEuler and other OSes. @@ -22,7 +24,7 @@ GCC released as a binary package for openEuler and other OSes. %global debug_package %{nil} %prep -%autosetup +%autosetup -p1 cp -f %{_sourcedir}/%{config} build/ %build @@ -41,6 +43,9 @@ sha256sum %{build_name}.tar.gz > %{build_name}.tar.gz.sha256 %attr(755, root, root) /%{build_name}.tar.gz.sha256 %changelog +* Tue Dec 27 2022 Xiong Zhou - 1.0.4-7 +- Change branch name for optimized routines. + * Wed Dec 21 2022 Xiong Zhou - 1.0.4-6 - Update the date to 2022.12 in the gcc build name. -- Gitee