diff --git a/gcc-12.spec b/gcc-12.spec index a3517df..caace54 100644 --- a/gcc-12.spec +++ b/gcc-12.spec @@ -1,9 +1,6 @@ %global scl 1 -%global gcc_version 12.2.1 %global gcc_major 12 -%global gcc_release 4 -%global isl_version 0.18 %global _unpackaged_files_terminate_build 0 %global _performance_build 1 @@ -69,7 +66,6 @@ %else %global build_libitm 0 %endif -%global build_isl 1 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips} %global attr_ifunc 1 %else @@ -87,19 +83,18 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: %{?scl_prefix}gcc -Version: %{gcc_version} -Release: %{gcc_release} +Version: 12.2.1 +Release: 5 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD Source0: https://ftp.gnu.org/gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz -Source1: https://gcc.gnu.org/pub/gcc/infrastructure/isl-%{isl_version}.tar.bz2 URL: http://gcc.gnu.org BuildRequires: binutils >= 2.31 BuildRequires: glibc-headers BuildRequires: libtool, zlib-devel, texinfo, gettext, flex, bison, sharutils -BuildRequires: gmp-devel >= 4.1.2, mpfr-devel >= 3.1.0, libmpc-devel >= 0.8.1 +BuildRequires: gmp-devel >= 4.1.2, mpfr-devel >= 3.1.0, libmpc-devel >= 0.8.1, isl-devel >= 0.15.0 BuildRequires: gcc, gcc-c++, make BuildRequires: gdb BuildRequires: glibc-devel >= 2.17 @@ -593,11 +588,11 @@ not stable, so plugins must be rebuilt any time GCC is updated. %prep -%setup -q -n gcc-12.2.0 -a 1 +%setup -q -n gcc-12.2.0 %patch0 -p1 -echo 'openEuler %{version}-%{gcc_release}' > gcc/DEV-PHASE +echo 'openEuler %{version}-%{release}' > gcc/DEV-PHASE cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h @@ -638,19 +633,6 @@ rm -rf obj-%{gcc_target_platform} mkdir obj-%{gcc_target_platform} cd obj-%{gcc_target_platform} -%if %{build_isl} -mkdir isl-build isl-install -cd isl-build -../../isl-%{isl_version}/configure \ - CC=/usr/bin/gcc CXX=/usr/bin/g++ \ - CFLAGS="$OPT_FLAGS -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpic" \ - CXXFLAGS="$OPT_FLAGS -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpic" \ - --prefix=`cd ..; pwd`/isl-install --disable-shared -make %{?_smp_mflags} -make install -cd ../ -%endif - enablelgo= enablelada= enablelobjc= @@ -671,7 +653,7 @@ enableld=,d CONFIGURE_OPTS="\ --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --with-bugurl=https://gitee.com/src-openeuler/gcc/issues \ - --enable-shared --enable-threads=posix --enable-checking=release \ + --enable-shared --enable-threads=posix --enable-checking=release --with-isl \ %ifarch aarch64 riscv64 --enable-multilib \ %else @@ -684,11 +666,6 @@ CONFIGURE_OPTS="\ --with-linker-hash-style=gnu \ %endif --enable-plugin --enable-initfini-array \ -%if %{build_isl} - --with-isl=`pwd`/isl-install \ -%else - --without-isl \ -%endif %if %{attr_ifunc} --enable-gnu-indirect-function \ %endif @@ -2670,6 +2647,9 @@ end %doc rpm.doc/changelogs/libcc1/ChangeLog* %changelog +* Wed Nov 02 2022 liyancheng <412998149@qq.com> 12.2.1-5 +- Change isl dependency from Source to BuildRequire + * Wed Nov 02 2022 liyancheng <412998149@qq.com> 12.2.1-4 - Upgrade GCC to 12.2.1 diff --git a/isl-0.18.tar.bz2 b/isl-0.18.tar.bz2 deleted file mode 100644 index 4c8296c..0000000 Binary files a/isl-0.18.tar.bz2 and /dev/null differ