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 0000000000000000000000000000000000000000..cad62ba3a0a2151edf53eb124dcbbfd028aa241a --- /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/0002-Change-branch-name-for-jemalloc.patch b/0002-Change-branch-name-for-jemalloc.patch new file mode 100644 index 0000000000000000000000000000000000000000..991c037062410c6954ed6d8a04d6f1067a954208 --- /dev/null +++ b/0002-Change-branch-name-for-jemalloc.patch @@ -0,0 +1,26 @@ +From 15dedba7cbd5861663015a0515081ff965b767f6 Mon Sep 17 00:00:00 2001 +From: Xiong Zhou +Date: Thu, 29 Jun 2023 10:19:37 +0800 +Subject: [PATCH] [gcc-for-openEuler] Change branch name for jemalloc. + +--- + build/download.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build/download.sh b/build/download.sh +index 52019d2..ec25a6b 100644 +--- a/build/download.sh ++++ b/build/download.sh +@@ -39,7 +39,8 @@ download $MPFR_NAME + download $ISL_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 ++[ -d "$JEMALLOC_NAME" ] && rm -rf $JEMALLOC_NAME ++echo "Download $JEMALLOC_NAME." && git clone -b openEuler-22.03-LTS-SP1-release https://gitee.com/src-openeuler/$JEMALLOC_NAME.git + download $AUTOFDO_NAME + download $BOLT_NAME + download $CMAKE_NAME +-- +2.33.0 + diff --git a/config.xml b/config.xml index cc53fbcd9d903cbdb3d59ae84e9197d7fa413546..4da0002d1140679153e0393a7665792cbed91860 100644 --- a/config.xml +++ b/config.xml @@ -1,6 +1,6 @@ -BRANCH="openEuler-22.03-LTS-Next" -INSTALL_NATIVE="gcc-10.3.1-2022.12-aarch64-linux" -COMPILER_INFO="gcc for openEuler 2.3.3" +BRANCH="openEuler-22.03-LTS-SP2" +INSTALL_NATIVE="gcc-10.3.1-2023.06-aarch64-linux" +COMPILER_INFO="gcc for openEuler 2.3.4" GCC="gcc-10.3.0" BINUTILS="binutils-2.37" diff --git a/gcc-for-openEuler-1.0.4.tar.gz b/gcc-for-openEuler-1.0.4.tar.gz deleted file mode 100644 index 0e9d128d7b11addd519b642d9ed21ecd140e225a..0000000000000000000000000000000000000000 Binary files a/gcc-for-openEuler-1.0.4.tar.gz and /dev/null differ diff --git a/gcc-for-openEuler-1.0.5.tar.gz b/gcc-for-openEuler-1.0.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..580f666bb143e7b68389e7a004ef844f96c949cc Binary files /dev/null and b/gcc-for-openEuler-1.0.5.tar.gz differ diff --git a/gcc-for-openEuler.spec b/gcc-for-openEuler.spec index d1aab4fcec5c0e3726aea12b593b9522c0387092..c17de641c9dc549017b5a21f5bb9be48061a546a 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 +Version: 1.0.5 +Release: 8 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 @@ -8,13 +8,16 @@ URL: https://gitee.com/openEuler/gcc-for-openEuler Source0: %{name}-%{version}.tar.gz %global config config.xml -%global build_name gcc-10.3.1-2022.12-aarch64-linux +%global build_name gcc-10.3.1-2023.06-aarch64-linux 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 +Patch2: 0002-Change-branch-name-for-jemalloc.patch + %description GCC released as a binary package for openEuler and other OSes. @@ -22,7 +25,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 +44,12 @@ sha256sum %{build_name}.tar.gz > %{build_name}.tar.gz.sha256 %attr(755, root, root) /%{build_name}.tar.gz.sha256 %changelog +* Mon Jun 19 2023 Xiong Zhou - 1.0.5-8 +- Update the version and branch names. + +* 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.