From 3911186fc058bc0e03d9a2de6fa58e67f3f12ffa Mon Sep 17 00:00:00 2001
From: huang-xiaoquan <huangxiaoquan1@huawei.com>
Date: Wed, 12 Apr 2023 17:35:24 +0800
Subject: [PATCH] [SPEC] Enable isl and add --with-isl

---
 gcc.spec | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/gcc.spec b/gcc.spec
index 2013280..0da483c 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -46,7 +46,7 @@
 %else
 %global build_libitm 0
 %endif
-%global build_isl 0
+%global build_isl 1
 %global build_libstdcxx_docs 0
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
 %global attr_ifunc 1
@@ -61,12 +61,12 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: 26
+Release: 27
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
 URL: https://gcc.gnu.org
 
 Source0: https://ftp.gnu.org/gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz
-%global isl_version 0.16.1
+%global isl_version 0.15
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: binutils >= 2.31
@@ -89,13 +89,8 @@ BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1
 BuildRequires: libunwind >= 0.98
 %endif
 %if %{build_isl}
-BuildRequires: isl = %{isl_version}
-BuildRequires: isl-devel = %{isl_version}
-%if 0%{?__isa_bits} == 64
-Requires: libisl.so.15()(64bit)
-%else
-Requires: libisl.so.15
-%endif
+BuildRequires: isl >= %{isl_version}, isl-devel >= %{isl_version}
+Requires: isl >= %{isl_version}, isl-devel >= %{isl_version}
 %endif
 %if %{build_libstdcxx_docs}
 BuildRequires: doxygen >= 1.7.1
@@ -813,7 +808,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
 	   --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
 	   --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu \
 	   --enable-languages=c,c++,fortran${enablelobjc}${enablelada}${enablelgo}${enableld},lto --enable-plugin \
-	   --enable-initfini-array --disable-libgcj --without-isl --without-cloog \
+	   --enable-initfini-array --disable-libgcj --with-isl --without-cloog \
 	   --enable-gnu-indirect-function --build=%{gcc_target_platform} \
 	   --with-stage1-ldflags="$OPT_LDFLAGS" \
 	   --with-boot-ldflags="$OPT_LDFLAGS" --disable-bootstrap \
@@ -2772,6 +2767,12 @@ end
 %doc rpm.doc/changelogs/libcc1/ChangeLog*
 
 %changelog
+* Wed Apr 12 2023 huangxiaoquan <huangxiaoquan1@huawei.com> - 10.3.1-27
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:enable isl and add --with-isl
+
 * Fri Mar 24 2023 huangxiaoquan <huangxiaoquan1@huawei.com> - 10.3.1-26
 - Type:SPEC
 - ID:NA
-- 
Gitee