diff --git a/0001-Change-branch-name-for-mathlib-and-jemalloc.patch b/0001-Change-branch-name-for-mathlib-and-jemalloc.patch deleted file mode 100644 index 5145daf28b58cdb3291aed56f188d66d6e11bbc3..0000000000000000000000000000000000000000 --- a/0001-Change-branch-name-for-mathlib-and-jemalloc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4f655dda39f5abe1c1d6028bdf22186b628900a8 Mon Sep 17 00:00:00 2001 -From: yinchuang -Date: Mon, 17 Mar 2025 15:42:21 +0800 -Subject: [PATCH] Change branch name for mathlib and jemalloc. - ---- - build/download.sh | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/build/download.sh b/build/download.sh -index 727e2c4..93d4634 100644 ---- a/build/download.sh -+++ b/build/download.sh -@@ -57,8 +57,10 @@ download $TEXINFO_NAME - download $MPC_NAME - download $MPFR_NAME - download $ISL_NAME --download $MATHLIB_NAME --download $JEMALLOC_NAME -+[ -d "$MATHLIB_NAME" ] && rm -rf $MATHLIB_NAME -+echo "Download $MATHLIB_NAME." && git clone -b openEuler-25.03-release https://gitee.com/src-openeuler/$MATHLIB_NAME.git -+[ -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/0002-Move-libmathlib.so-to-lib64_public.patch b/0002-Move-libmathlib.so-to-lib64_public.patch deleted file mode 100644 index c6c696cbdd1df7bd281d78d4e4e605cc52dd973d..0000000000000000000000000000000000000000 --- a/0002-Move-libmathlib.so-to-lib64_public.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c0a76f0688d683238cb40308e02b721a2c66937c Mon Sep 17 00:00:00 2001 -From: yinchuang -Date: Thu, 20 Mar 2025 16:36:49 +0800 -Subject: [PATCH] Move libmathlib.so to lib64_public. - ---- - build/hcc_arm64le_native/hcc_aarch64_native_final.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/hcc_arm64le_native/hcc_aarch64_native_final.sh b/build/hcc_arm64le_native/hcc_aarch64_native_final.sh -index 487c696..77b644f 100644 ---- a/build/hcc_arm64le_native/hcc_aarch64_native_final.sh -+++ b/build/hcc_arm64le_native/hcc_aarch64_native_final.sh -@@ -51,7 +51,7 @@ echo "math-cflags += ${CFLAGS_FOR_MATHLIB}" >>config.mk - echo "CFLAGS += ${CFLAGS_FOR_MATHLIB}" >>config.mk - sed -i "s/SUBS = math string networking/SUBS = math string/g" config.mk - sed -i "s@prefix = /usr@prefix = ${PREFIX_NATIVE}@" Makefile --sed -i "s@libdir = \$(prefix)/lib@libdir = \${PREFIX_PUBLIC}@" Makefile -+sed -i "s@libdir = \$(prefix)/lib@libdir = ${PREFIX_PUBLIC}@" Makefile - make -j $PARALLEL && make install -j $PARAELLEL && popd - - echo "Building jemalloc..." && pushd $ROOT_NATIVE_SRC/$JEMALLOC --- -2.33.0 - diff --git a/0003-Move-AI4C-to-lib64_public.patch b/0003-Move-AI4C-to-lib64_public.patch deleted file mode 100644 index 2dbb0c1aa6b410c50385f1a9655619158444d7ee..0000000000000000000000000000000000000000 --- a/0003-Move-AI4C-to-lib64_public.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 38f74ce1182b0352cefc766b97f4a7f0dde218e9 Mon Sep 17 00:00:00 2001 -From: yinchuang -Date: Thu, 10 Apr 2025 09:41:04 +0800 -Subject: [PATCH] Move AI4C to lib64_public. - ---- - build/hcc_arm64le_native/install_ai4c.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build/hcc_arm64le_native/install_ai4c.sh b/build/hcc_arm64le_native/install_ai4c.sh -index 78a1e27..ad60a5f 100644 ---- a/build/hcc_arm64le_native/install_ai4c.sh -+++ b/build/hcc_arm64le_native/install_ai4c.sh -@@ -3,9 +3,9 @@ - cur_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" - - # Locate the .whl files to install. --ai4cglob=( $cur_dir/../lib64/AI4C/ai4c-*.whl ) --opentunerglob=( $cur_dir/../lib64/AI4C/huawei_opentuner-*.whl ) --autotunerglob=( $cur_dir/../lib64/AI4C/autotuner-*.whl ) -+ai4cglob=( $cur_dir/../lib64_public/AI4C/ai4c-*.whl ) -+opentunerglob=( $cur_dir/../lib64_public/AI4C/huawei_opentuner-*.whl ) -+autotunerglob=( $cur_dir/../lib64_public/AI4C/autotuner-*.whl ) - - python3=$(type -p python3) - $python3 -m pip install "${ai4cglob[-1]}" --- -2.33.0 - diff --git a/config.xml b/config.xml index 887f3b85ad05d0a0f973152f1bc0b07f6450e785..db359603b29f84fa41d5655d943dc8377bcef6c3 100644 --- a/config.xml +++ b/config.xml @@ -1,11 +1,11 @@ -BRANCH="openEuler-25.03" -INSTALL_NATIVE="gcc-12.3.1-2025.03-aarch64-linux" -COMPILER_INFO="gcc for openEuler 3.0.2" +BRANCH="openEuler-24.03-LTS-SP2" +INSTALL_NATIVE="gcc-12.3.1-2025.06-aarch64-linux" +COMPILER_INFO="gcc for openEuler 3.0.3" GCC="gcc-12.3.0" BINUTILS="binutils-2.41" GMP="gmp-6.3.0" -TEXINFO="texinfo-7.2" +TEXINFO="texinfo-7.0.3" MPC="mpc-1.3.1" MPFR="mpfr-4.2.1" ISL="isl-0.24" @@ -15,21 +15,22 @@ AUTOFDO="autofdo-0.30.1" BOLT="llvm-project-17.0.6.src" CMAKE="cmake-3.27.9" AI4C="AI4C-v1.0.4-alpha" -YAML_CPP="yaml-cpp-0.8.0" +YAML_CPP="yaml-cpp-0.7.0" OPENSSL="openssl-3.0.12" -NCURSES="ncurses-6.5" -LLVM="llvm-17.0.6.src" +NCURSES="ncurses-6.4" +LLVM="llvm-for-oE-17.0.6-2506.0.2" LLVM_CMAKE="cmake-17.0.6.src" LLVM_THIRD_PARTY="third-party-17.0.6.src" MLIR="mlir-17.0.6.src" PROTOBUF="protobuf-25.1" GCC_CLIENT="pin-gcc-client-0.4.1" GRPC="grpc-1.60.0" -CARES="c-ares-1.34.4" -ABSEIL="abseil-cpp-20240722.0" -RE2="re2-2024-07-02" +CARES="c-ares-1.19.1" +ABSEIL="abseil-cpp-20230802.1" +RE2="2024-02-01" JSONCPP="jsoncpp-1.9.5" PERL="perl-5.38.0" PERL_IPC_CMD="IPC-Cmd-1.04" OPEN_TUNER="BiSheng-opentuner-0.8.8" AUTO_TUNER="BiSheng-Autotuner-2.2.0" + diff --git a/gcc-for-openEuler-2.0.2.tar.gz b/gcc-for-openEuler-2.0.2.tar.gz deleted file mode 100644 index e96c91e2259d6f927ab2c0f376b3ecaec9a0e653..0000000000000000000000000000000000000000 Binary files a/gcc-for-openEuler-2.0.2.tar.gz and /dev/null differ diff --git a/gcc-for-openEuler-2.0.3.tar.gz b/gcc-for-openEuler-2.0.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..2e8760f704fd39e8eb2405d882eff7900616c681 Binary files /dev/null and b/gcc-for-openEuler-2.0.3.tar.gz differ diff --git a/gcc-for-openEuler.spec b/gcc-for-openEuler.spec index d87f222474b25f135d50c361cd9d969ebfe53782..e07d7a98e20949ef229cbf951fa2bef74af347c0 100644 --- a/gcc-for-openEuler.spec +++ b/gcc-for-openEuler.spec @@ -1,6 +1,6 @@ Name: gcc-for-openEuler -Version: 2.0.2 -Release: 4 +Version: 2.0.3 +Release: 1 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 @@ -9,16 +9,13 @@ Source0: %{name}-%{version}.tar.gz Source1: wheel-0.37.1-py2.py3-none-any.whl %global config config.xml -%global build_name gcc-12.3.1-2025.03-aarch64-linux +%global build_name gcc-12.3.1-2025.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 python3-setuptools -Patch1: 0001-Change-branch-name-for-mathlib-and-jemalloc.patch -Patch2: 0002-Move-libmathlib.so-to-lib64_public.patch -Patch3: 0003-Move-AI4C-to-lib64_public.patch %description GCC released as a binary package for openEuler and other OSes. @@ -48,6 +45,9 @@ sha256sum %{build_name}.tar.gz > %{build_name}.tar.gz.sha256 %attr(755, root, root) /%{build_name}.tar.gz.sha256 %changelog +* Sat Jun 14 2025 Cao Jiaju <272503532@qq.com> - 2.0.3-1 +- version number compatible with 24.03 LTS SP2 & fix path error of lib/lib64 + * Thu Apr 10 2025 Zheng Chenhui - 2.0.2-4 - -Move AI4C to lib64_public.