diff --git a/0002-Fix-build-bug-for-openssl.patch b/0002-Fix-build-bug-for-openssl.patch deleted file mode 100644 index d405c86a6e2f4d9b0f3e86b5040e1a7184d1a730..0000000000000000000000000000000000000000 --- a/0002-Fix-build-bug-for-openssl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a619def04c61b09b6762131fe15373d78035de45 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E9=83=91=E6=99=A8=E5=8D=89?= -Date: Wed, 29 Nov 2023 17:36:13 +0800 -Subject: [PATCH] [gcc-for-openEuler]Fix build bug for openssl. - ---- - build/hcc_arm64le_native/hcc_aarch64_native_release.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/hcc_arm64le_native/hcc_aarch64_native_release.sh b/build/hcc_arm64le_native/hcc_aarch64_native_release.sh -index 630a0b5..9db1e64 100644 ---- a/build/hcc_arm64le_native/hcc_aarch64_native_release.sh -+++ b/build/hcc_arm64le_native/hcc_aarch64_native_release.sh -@@ -75,7 +75,7 @@ make -j $PARALLEL && make install prefix=$PREFIX_NATIVE exec_prefix=$PREFIX_NATI - # Temporarily install OpenSSL to provide fixed libcrypto.so version for various OSes. - echo "Building openssl for autofdo..." && pushd $ROOT_NATIVE_DIR/obj/build-openssl - cp -rf $ROOT_NATIVE_SRC/$OPENSSL/* . --LDFLAGS="${SECURE_LDFLAGS}" CFLAGS="${SECURE_CFLAGS}" CXXFLAGS="${SECURE_CFLAGS}" ./Configure --prefix=$PREFIX_OPENSSL --openssldir=$PREFIX_OPENSSL enable-ec_nistp_64_gcc_128 zlib enable-camellia enable-seed enable-rfc3779 enable-sctp enable-cms enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-mdc2 no-ec2m enable-sm2 enable-sm3 enable-sm4 enable-tlcp shared linux-aarch64 -Wa,--noexecstack -DPURIFY '-DDEVRANDOM="\"/dev/urandom\""' -+LDFLAGS="${SECURE_LDFLAGS}" CFLAGS="${SECURE_CFLAGS}" CXXFLAGS="${SECURE_CFLAGS}" ./Configure --prefix=$PREFIX_OPENSSL --openssldir=$PREFIX_OPENSSL enable-ec_nistp_64_gcc_128 zlib enable-camellia enable-seed enable-rfc3779 enable-sctp enable-cms enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-mdc2 no-ec2m enable-sm2 enable-sm3 enable-sm4 shared linux-aarch64 -Wa,--noexecstack -DPURIFY '-DDEVRANDOM="\"/dev/urandom\""' - make -j $PARALLEL && make install && popd - - export OPENSSL_ROOT_DIR=$PREFIX_OPENSSL --- -2.33.0 - diff --git a/0003-Fix-patching-errors-for-binutils.patch b/0003-Fix-patching-errors-for-binutils.patch deleted file mode 100644 index f0c50e36a08c63496bbc51831692f317df45e074..0000000000000000000000000000000000000000 --- a/0003-Fix-patching-errors-for-binutils.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e020f8bbe15e0da4e2618f818294e118a5d61178 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E9=83=91=E6=99=A8=E5=8D=89?= -Date: Thu, 30 Nov 2023 10:26:22 +0800 -Subject: [PATCH] [gcc-for-openEuler]Fix patching errors for binutils. - ---- - build/hcc_arm64le_native/pre_construction.sh | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/build/hcc_arm64le_native/pre_construction.sh b/build/hcc_arm64le_native/pre_construction.sh -index a80ece0..cf7d0b7 100644 ---- a/build/hcc_arm64le_native/pre_construction.sh -+++ b/build/hcc_arm64le_native/pre_construction.sh -@@ -53,9 +53,15 @@ apply_patch() { - else - cd $ROOT_NATIVE_SRC/$2 - fi -- for file in $(grep -ne ^Patch[0-9]*:.*\.patch $ROOT_BUILD_DIR/open_source/$1/$1.spec | awk '{print $2}'); do -- patch --fuzz=0 -p1 <$ROOT_BUILD_DIR/open_source/$1/$file -- done -+ if [ $1 = "binutils" ]; then -+ for file in $(grep -ne ^Patch[0-9]\{1,2\}:.*\.patch $ROOT_BUILD_DIR/open_source/$1/$1.spec | awk '{print $2}'); do -+ patch --fuzz=0 -p1 <$ROOT_BUILD_DIR/open_source/$1/$file -+ done -+ else -+ for file in $(grep -ne ^Patch[0-9]*:.*\.patch $ROOT_BUILD_DIR/open_source/$1/$1.spec | awk '{print $2}'); do -+ patch --fuzz=0 -p1 <$ROOT_BUILD_DIR/open_source/$1/$file -+ done -+ fi - cd - - } - --- -2.33.0 - diff --git a/config.xml b/config.xml index 3d37f1deb4ad6a13a00e575446f289f4872d3863..cd96be6fde289b137b083a36722c088229d0b988 100644 --- a/config.xml +++ b/config.xml @@ -1,6 +1,6 @@ -BRANCH="openEuler-22.03-LTS-SP3" -INSTALL_NATIVE="gcc-10.3.1-2023.12-aarch64-linux" -COMPILER_INFO="gcc for openEuler 2.3.6" +BRANCH="openEuler-22.03-LTS-SP4" +INSTALL_NATIVE="gcc-10.3.1-2024.06-aarch64-linux" +COMPILER_INFO="gcc for openEuler 2.3.7" GCC="gcc-10.3.0" BINUTILS="binutils-2.37" @@ -14,7 +14,7 @@ JEMALLOC="jemalloc-5.2.1" AUTOFDO="autofdo-0.19" BOLT="llvm-project-15.0.7.src" CMAKE="cmake-3.22.0" -OPENSSL="openssl-1.1.1wa" +OPENSSL="openssl-1.1.1m" NCURSES="ncurses-6.3" MLIR="llvm-project-12.0.1.src" PROTOBUF="protobuf-3.14.0" diff --git a/gcc-for-openEuler-1.0.7.tar.gz b/gcc-for-openEuler-1.0.7.tar.gz deleted file mode 100644 index 24bee540126521aa57016bc151e6d411a25eaa24..0000000000000000000000000000000000000000 Binary files a/gcc-for-openEuler-1.0.7.tar.gz and /dev/null differ diff --git a/gcc-for-openEuler-1.0.8.tar.gz b/gcc-for-openEuler-1.0.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8e4a6bea9f8d8a8febc4cbfc42cedd88b73daf86 Binary files /dev/null and b/gcc-for-openEuler-1.0.8.tar.gz differ diff --git a/gcc-for-openEuler.spec b/gcc-for-openEuler.spec index 3b07528078e5d21940de33b60420a065a59891ab..ae488f9764ae5aedb4d9a0efa4a377c7ee13ade8 100644 --- a/gcc-for-openEuler.spec +++ b/gcc-for-openEuler.spec @@ -1,6 +1,6 @@ Name: gcc-for-openEuler -Version: 1.0.7 -Release: 10 +Version: 1.0.8 +Release: 11 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,7 +8,7 @@ URL: https://gitee.com/openEuler/gcc-for-openEuler Source0: %{name}-%{version}.tar.gz %global config config.xml -%global build_name gcc-10.3.1-2023.12-aarch64-linux +%global build_name gcc-10.3.1-2024.06-aarch64-linux ExclusiveArch: aarch64 @@ -16,8 +16,6 @@ BuildRequires: git bison flex texinfo autoconf libtool elfutils-libelf-devel gl BuildRequires: chrpath python3 zlib-devel lksctp-tools-devel Patch1: 0001-Change-branch-name-for-jemalloc.patch -Patch2: 0002-Fix-build-bug-for-openssl.patch -Patch3: 0003-Fix-patching-errors-for-binutils.patch %description GCC released as a binary package for openEuler and other OSes. @@ -45,6 +43,9 @@ sha256sum %{build_name}.tar.gz > %{build_name}.tar.gz.sha256 %attr(755, root, root) /%{build_name}.tar.gz.sha256 %changelog +* Mon Jun 17 2024 Xiong Zhou - 1.0.8-11 +- Update to 2024.06 version. + * Wed Jan 3 2024 Xiong Zhou - 1.0.7-10 - Revise build options for BOLT and jemalloc.