!6 版本升级至 0.24

From: @licihua 
Reviewed-by: @jianminw 
Signed-off-by: @jianminw

isl.spec

@@ -1,35 +1,24 @@
 Summary: Integer point manipulation library
 Name: isl
-Version: 0.16.1
+Version: 0.24
 License: MIT
 URL: http://isl.gforge.inria.fr/
 
-%global libmajor 15
+%global libmajor 23
-%global libversion %{libmajor}.1.1
+%global libversion %{libmajor}.1.0
-
-%global oldversion 0.14
-%global oldlibmajor 13
-%global oldlibversion %{oldlibmajor}.1.0
 
 # Please set buildid below when building a private version of this rpm to
 # differentiate it from the stock rpm.
 #
 # % global buildid .local
 
-Release: 11%{?buildid}
+Release: 1%{?buildid}
 
 BuildRequires:  gcc
 BuildRequires: gmp-devel
 BuildRequires: pkgconfig
-Provides: isl = %{oldversion}
 
-Source0: http://isl.gforge.inria.fr/isl-%{version}.tar.xz
+Source: http://isl.gforge.inria.fr/isl-%{version}.tar.gz
-
-# Current gcc requires exactly 0.14
-Source1: http://isl.gforge.inria.fr/isl-%{oldversion}.tar.xz
-
-# update python2 src file to python3
-Patch0: python3.patch
 
 %description
 isl is a library for manipulating sets and relations of integer points
@@ -58,24 +47,14 @@ graphs), dependence analysis and bounds on piecewise step-polynomials.
 
 %prep
 %global docdir isl-%{version}
-%setup -a 1 -q -n isl -c
+%setup -a 0 -q -n isl -c
-%patch0 -p1
 
 %build
-cd isl-%{oldversion}
-%configure
-make %{?_smp_mflags} V=1
-cd ..
-
 cd isl-%{version}
-%configure
+%configure 
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}  V=1 CFLAGS="%{optflags}"
 
 %install
-cd isl-%{oldversion}
-%make_install INSTALL="install -p" install-libLTLIBRARIES
-cd ..
-
 cd isl-%{version}
 %make_install INSTALL="install -p"
 rm -f %{buildroot}/%{_libdir}/libisl.a
@@ -86,10 +65,6 @@ mkdir -p %{buildroot}/%{gdbprettydir}
 mv %{buildroot}/%{_libdir}/*-gdb.py* %{buildroot}/%{gdbprettydir}
 
 %check
-cd isl-%{oldversion}
-#make check
-cd ..
-
 cd isl-%{version}
 #make check
 
@@ -98,8 +73,6 @@ cd isl-%{version}
 %files
 %{_libdir}/libisl.so.%{libmajor}
 %{_libdir}/libisl.so.%{libversion}
-%{_libdir}/libisl.so.%{oldlibmajor}
-%{_libdir}/libisl.so.%{oldlibversion}
 %{gdbprettydir}/*
 %license %{docdir}/LICENSE
 %doc %{docdir}/AUTHORS %{docdir}/ChangeLog %{docdir}/README
@@ -112,6 +85,9 @@ cd isl-%{version}
 
 
 %changelog
+* Mon Mar 7 2022 licihua <licihua@huawei.com> - 0.24-1
+- upgrade to 0.24
+
 * Tue Dec 14 2021 konglidong <konglidong@uniontech.com> - 0.16.1-11
 - delete %dist
 

python3.patch

@@ -1,210 +0,0 @@
-diff --git a/isl-0.14/isl.py b/isl-0.14/isl.py
-index 6382f63..9b76f42 100644
---- a/isl-0.14/isl.py
-+++ b/isl-0.14/isl.py
-@@ -64,10 +64,10 @@ class IslPrintCommand (gdb.Command):
-                 printer = str_lookup_function(arg)
- 
-                 if printer == None:
--                        print "No isl printer for this type"
-+                        print("No isl printer for this type")
-                         return
- 
--                print printer.to_string()
-+                print(printer.to_string())
- 
- IslPrintCommand()
- 
-diff --git a/isl-0.16.1/isl.py b/isl-0.16.1/isl.py
-index 6382f63..9b76f42 100644
---- a/isl-0.16.1/isl.py
-+++ b/isl-0.16.1/isl.py
-@@ -64,10 +64,10 @@ class IslPrintCommand (gdb.Command):
-                 printer = str_lookup_function(arg)
- 
-                 if printer == None:
--                        print "No isl printer for this type"
-+                        print("No isl printer for this type")
-                         return
- 
--                print printer.to_string()
-+                print(printer.to_string())
- 
- IslPrintCommand()
- 
-diff --git a/isl-0.14/isl.py b/isl-0.14/isl.py
-index 9b76f42..06236ef 100644
---- a/isl-0.14/isl.py
-+++ b/isl-0.14/isl.py
-@@ -3,19 +3,19 @@ import re
- 
- # GDB Pretty Printers for most isl objects
- class IslObjectPrinter:
--	"""Print an isl object"""
--	def __init__ (self, val, type):
-+        """Print an isl object"""
-+        def __init__ (self, val, type):
-                 self.val = val
-                 self.type = type
- 
--	def to_string (self):
-+        def to_string (self):
-                 # Cast val to a void pointer to stop gdb using this pretty
-                 # printer for the pointer which would lead to an infinite loop.
-                 void_ptr = gdb.lookup_type('void').pointer()
-                 value = str(self.val.cast(void_ptr))
-                 printer = gdb.parse_and_eval("isl_printer_to_str(isl_"
-                                              + str(self.type)
--					     + "_get_ctx(" + value + "))")
-+                                             + "_get_ctx(" + value + "))")
-                 printer = gdb.parse_and_eval("isl_printer_print_"
-                                              + str(self.type) + "("
-                                              + str(printer) + ", "
-@@ -25,15 +25,15 @@ class IslObjectPrinter:
-                 gdb.parse_and_eval("isl_printer_free(" + str(printer) + ")")
-                 return string
- 
--	def display_hint (self):
-+        def display_hint (self):
-                 return 'string'
- 
- class IslIntPrinter:
--	"""Print an isl_int """
--	def __init__ (self, val):
-+        """Print an isl_int """
-+        def __init__ (self, val):
-                 self.val = val
- 
--	def to_string (self):
-+        def to_string (self):
-                 # Cast val to a void pointer to stop gdb using this pretty
-                 # printer for the pointer which would lead to an infinite loop.
-                 void_ptr = gdb.lookup_type('void').pointer()
-@@ -51,7 +51,7 @@ class IslIntPrinter:
-                 gdb.parse_and_eval("isl_ctx_free(" + str(context) + ")")
-                 return string
- 
--	def display_hint (self):
-+        def display_hint (self):
-                 return 'string'
- 
- class IslPrintCommand (gdb.Command):
-@@ -72,21 +72,21 @@ class IslPrintCommand (gdb.Command):
- IslPrintCommand()
- 
- def str_lookup_function (val):
--	if val.type.code != gdb.TYPE_CODE_PTR:
--		if str(val.type) == "isl_int":
--			return IslIntPrinter(val)
-+        if val.type.code != gdb.TYPE_CODE_PTR:
-+                if str(val.type) == "isl_int":
-+                        return IslIntPrinter(val)
-                 else:
-                         return None
- 
--	lookup_tag = val.type.target()
--	regex = re.compile ("^isl_(.*)$")
-+        lookup_tag = val.type.target()
-+        regex = re.compile ("^isl_(.*)$")
- 
--	if lookup_tag == None:
--		return None
-+        if lookup_tag == None:
-+                return None
- 
--	m = regex.match (str(lookup_tag))
-+        m = regex.match (str(lookup_tag))
- 
--	if m:
-+        if m:
-                 # Those types of printers defined in isl.
-                 if m.group(1) in ["basic_set", "set", "union_set", "basic_map",
-                                   "map", "union_map", "qpolynomial",
-diff --git a/isl-0.16.1/isl.py b/isl-0.16.1/isl.py
-index 9b76f42..06236ef 100644
---- a/isl-0.16.1/isl.py
-+++ b/isl-0.16.1/isl.py
-@@ -3,19 +3,19 @@ import re
- 
- # GDB Pretty Printers for most isl objects
- class IslObjectPrinter:
--	"""Print an isl object"""
--	def __init__ (self, val, type):
-+        """Print an isl object"""
-+        def __init__ (self, val, type):
-                 self.val = val
-                 self.type = type
- 
--	def to_string (self):
-+        def to_string (self):
-                 # Cast val to a void pointer to stop gdb using this pretty
-                 # printer for the pointer which would lead to an infinite loop.
-                 void_ptr = gdb.lookup_type('void').pointer()
-                 value = str(self.val.cast(void_ptr))
-                 printer = gdb.parse_and_eval("isl_printer_to_str(isl_"
-                                              + str(self.type)
--					     + "_get_ctx(" + value + "))")
-+                                             + "_get_ctx(" + value + "))")
-                 printer = gdb.parse_and_eval("isl_printer_print_"
-                                              + str(self.type) + "("
-                                              + str(printer) + ", "
-@@ -25,15 +25,15 @@ class IslObjectPrinter:
-                 gdb.parse_and_eval("isl_printer_free(" + str(printer) + ")")
-                 return string
- 
--	def display_hint (self):
-+        def display_hint (self):
-                 return 'string'
- 
- class IslIntPrinter:
--	"""Print an isl_int """
--	def __init__ (self, val):
-+        """Print an isl_int """
-+        def __init__ (self, val):
-                 self.val = val
- 
--	def to_string (self):
-+        def to_string (self):
-                 # Cast val to a void pointer to stop gdb using this pretty
-                 # printer for the pointer which would lead to an infinite loop.
-                 void_ptr = gdb.lookup_type('void').pointer()
-@@ -51,7 +51,7 @@ class IslIntPrinter:
-                 gdb.parse_and_eval("isl_ctx_free(" + str(context) + ")")
-                 return string
- 
--	def display_hint (self):
-+        def display_hint (self):
-                 return 'string'
- 
- class IslPrintCommand (gdb.Command):
-@@ -72,21 +72,21 @@ class IslPrintCommand (gdb.Command):
- IslPrintCommand()
- 
- def str_lookup_function (val):
--	if val.type.code != gdb.TYPE_CODE_PTR:
--		if str(val.type) == "isl_int":
--			return IslIntPrinter(val)
-+        if val.type.code != gdb.TYPE_CODE_PTR:
-+                if str(val.type) == "isl_int":
-+                        return IslIntPrinter(val)
-                 else:
-                         return None
- 
--	lookup_tag = val.type.target()
--	regex = re.compile ("^isl_(.*)$")
-+        lookup_tag = val.type.target()
-+        regex = re.compile ("^isl_(.*)$")
- 
--	if lookup_tag == None:
--		return None
-+        if lookup_tag == None:
-+                return None
- 
--	m = regex.match (str(lookup_tag))
-+        m = regex.match (str(lookup_tag))
- 
--	if m:
-+        if m:
-                 # Those types of printers defined in isl.
-                 if m.group(1) in ["basic_set", "set", "union_set", "basic_map",
-                                   "map", "union_map", "qpolynomial",