diff --git a/0001-Change-branch-name-for-jemalloc.patch b/0001-Change-branch-name-for-jemalloc.patch new file mode 100644 index 0000000000000000000000000000000000000000..58a6613b510dfa01c97fcf30f59d0a9560c90182 --- /dev/null +++ b/0001-Change-branch-name-for-jemalloc.patch @@ -0,0 +1,26 @@ +From 19cf82fdea7cdff3b09710707ff3ae5c88cf206d 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 15:54:21 +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 73e040e..27dcd4b 100644 +--- a/build/download.sh ++++ b/build/download.sh +@@ -47,7 +47,8 @@ download $MPC_NAME + download $MPFR_NAME + download $ISL_NAME + download $MATHLIB_NAME +-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/0002-Fix-build-bug-for-openssl.patch b/0002-Fix-build-bug-for-openssl.patch new file mode 100644 index 0000000000000000000000000000000000000000..d405c86a6e2f4d9b0f3e86b5040e1a7184d1a730 --- /dev/null +++ b/0002-Fix-build-bug-for-openssl.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..f0c50e36a08c63496bbc51831692f317df45e074 --- /dev/null +++ b/0003-Fix-patching-errors-for-binutils.patch @@ -0,0 +1,35 @@ +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 a354d16945c7ec4e6e75d62590a935cce70c0422..fac8e04d89772e17fee69626b4374bb570743524 100644 --- a/config.xml +++ b/config.xml @@ -1,6 +1,6 @@ BRANCH="openEuler-22.03-LTS-Next" -INSTALL_NATIVE="gcc-10.3.1-2023.09-aarch64-linux" -COMPILER_INFO="gcc for openEuler 2.3.4" +INSTALL_NATIVE="gcc-10.3.1-2023.11-aarch64-linux" +COMPILER_INFO="gcc for openEuler 2.3.5" GCC="gcc-10.3.0" BINUTILS="binutils-2.37" @@ -10,7 +10,7 @@ MPFR="mpfr-4.1.0" ISL="isl-0.16.1" OLD_ISL="isl-0.14" MATHLIB="optimized-routines-21.02" -JEMALLOC="jemalloc-5.3.0" +JEMALLOC="jemalloc-5.2.1" AUTOFDO="autofdo-0.19" BOLT="llvm-bolt-0" CMAKE="cmake-3.22.0" diff --git a/gcc-for-openEuler-1.0.5.tar.gz b/gcc-for-openEuler-1.0.5.tar.gz deleted file mode 100644 index dfec415cb85f5a6c7e314436c9883b67d0be6ee9..0000000000000000000000000000000000000000 Binary files a/gcc-for-openEuler-1.0.5.tar.gz and /dev/null differ diff --git a/gcc-for-openEuler-1.0.6.tar.gz b/gcc-for-openEuler-1.0.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e34c7097e2c2795d0cbb441ad837940075524d32 Binary files /dev/null and b/gcc-for-openEuler-1.0.6.tar.gz differ diff --git a/gcc-for-openEuler.spec b/gcc-for-openEuler.spec index 4c2109c2fffe1aaffab799ff2d3c37ebbba1cdcd..835735cd59a1b674c4fdfd83c84fb30525c53c4e 100644 --- a/gcc-for-openEuler.spec +++ b/gcc-for-openEuler.spec @@ -1,6 +1,6 @@ Name: gcc-for-openEuler -Version: 1.0.5 -Release: 7 +Version: 1.0.6 +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,12 +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-2023.09-aarch64-linux +%global build_name gcc-10.3.1-2023.11-aarch64-linux ExclusiveArch: aarch64 BuildRequires: git bison flex texinfo autoconf libtool elfutils-libelf-devel glibc-static -BuildRequires: chrpath centos-release-scl python3 zlib-devel lksctp-tools-devel +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. @@ -22,7 +26,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 +45,9 @@ sha256sum %{build_name}.tar.gz > %{build_name}.tar.gz.sha256 %attr(755, root, root) /%{build_name}.tar.gz.sha256 %changelog +* Wed Nov 29 2023 zhengchenhui - 1.0.6-8 +- Sync from openEuler and add pin-gcc-client. + * Fri Sep 22 2023 dingguangya - 1.0.5-7 - Support pin-gcc-client.