diff --git a/0001-gcc-anolis-Rebrand-for-OpenAnolis.patch b/0001-gcc-anolis-Rebrand-for-OpenAnolis.patch new file mode 100644 index 0000000000000000000000000000000000000000..dfca2f2a5b84a971567a98a2104e89f27172e5ae --- /dev/null +++ b/0001-gcc-anolis-Rebrand-for-OpenAnolis.patch @@ -0,0 +1,25 @@ +From 19b22393da77dfbe6b7c792955e41620db423b2f Mon Sep 17 00:00:00 2001 +From: xuehaolin +Date: Thu, 21 Jan 2021 21:09:15 +0800 +Subject: [PATCH] gcc anolis Rebrand for OpenAnolis + +--- + zlib/contrib/minizip/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zlib/contrib/minizip/configure.ac b/zlib/contrib/minizip/configure.ac +index 5b1197097..857ced9b5 100644 +--- a/zlib/contrib/minizip/configure.ac ++++ b/zlib/contrib/minizip/configure.ac +@@ -1,7 +1,7 @@ + # -*- Autoconf -*- + # Process this file with autoconf to produce a configure script. + +-AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com]) ++AC_INIT([minizip], [1.2.11], [https://bugzilla.openanolis.cn]) + AC_CONFIG_SRCDIR([minizip.c]) + AM_INIT_AUTOMAKE([foreign]) + LT_INIT +-- +2.18.4 + diff --git a/gcc.spec b/gcc.spec index e029f8945709361ea5c016e22970d4b7d2e29209..e302335f842bdf86e141b2c8dea60f342a62226c 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global DATE 20210514 %global gitrev a3253c88425835d5b339d6998a1110a66ccd8b44 %global gcc_version 8.5.0 @@ -13,7 +14,7 @@ # Until annobin is fixed (#1519165). %undefine _annotated_build %endif -%global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64 + %if 0%{?rhel} > 7 %global build_ada 0 %global build_objc 0 @@ -101,10 +102,11 @@ %ifarch x86_64 %global multilib_32_arch i686 %endif + Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}%{?dist} +Release: %{gcc_release}%{anolis_release}%{?dist} # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -293,6 +295,8 @@ Patch1000: nvptx-tools-no-ptxas.patch Patch1001: nvptx-tools-build.patch Patch1002: nvptx-tools-glibc.patch +Patch10000: 0001-gcc-anolis-Rebrand-for-OpenAnolis.patch + # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -880,7 +884,8 @@ cd nvptx-tools-%{nvptx_tools_gitrev} %patch1002 -p1 -b .nvptx-tools-glibc~ cd .. -echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE + +echo 'Anolis %{version}-%{gcc_release}%{anolis_release}' > gcc/DEV-PHASE cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h @@ -912,6 +917,8 @@ fi # This test causes fork failures, because it spawns way too many threads rm -f gcc/testsuite/go.test/test/chan/goroutines.go +%patch10000 -p1 + %build # Undo the broken autoconf change in recent Fedora versions @@ -965,7 +972,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" \ --target nvptx-none --enable-as-accelerator-for=%{gcc_target_platform} \ --enable-languages=c,c++,fortran,lto \ --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ - --with-bugurl=http://bugzilla.redhat.com/bugzilla \ + --with-bugurl=https://bugzilla.openanolis.cn \ --enable-checking=release --with-system-zlib \ --with-gcc-major-version-only --without-isl make %{?_smp_mflags} @@ -991,15 +998,19 @@ enablelgo=,go %endif CONFIGURE_OPTS="\ --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ - --with-bugurl=http://bugzilla.redhat.com/bugzilla \ + --with-bugurl=https://bugzilla.openanolis.cn \ --enable-shared --enable-threads=posix --enable-checking=release \ %ifarch ppc64le --enable-targets=powerpcle-linux \ %endif %ifarch ppc64le %{mips} riscv64 s390x --disable-multilib \ +%else +%if 0%{?anolis} + --disable-multilib \ %else --enable-multilib \ +%endif %endif --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \ --enable-gnu-unique-object --enable-linker-build-id --with-gcc-major-version-only \ @@ -3185,6 +3196,9 @@ fi %endif %changelog +* Wed Apr 13 2022 Xue haolin 8.5.0-10.0.1 +- Rebrand for Anolis OS. + * Thu Jan 27 2022 Marek Polacek 8.5.0-10 - fix typo in the cprop_hardreg patch (#2028609)