[gentoo-commits] proj/sci:master commit in: dev-python/llvmlite/files/, dev-python/llvmlite/

[Horea Christian]

commit:     79004b03e341bd74e25e1b3e021d8da672abc630
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Tue Apr 26 03:34:31 2022 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Apr 26 03:34:31 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=79004b03

dev-python/llvmlite: LLVM_MAX_SLOT bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 .../llvmlite/files/llvmlite-0.37.0-llvm12.patch    | 91 +++++++++++++++++++++
 .../llvmlite/files/llvmlite-0.38.0-llvm12.patch    | 92 ++++++++++++++++++++++
 ...ite-0.38.0.ebuild => llvmlite-0.37.0-r1.ebuild} |  4 +-
 ...ite-0.37.0.ebuild => llvmlite-0.38.0-r1.ebuild} |  6 +-
 4 files changed, 190 insertions(+), 3 deletions(-)

diff --git a/dev-python/llvmlite/files/llvmlite-0.37.0-llvm12.patch b/dev-python/llvmlite/files/llvmlite-0.37.0-llvm12.patch
new file mode 100644
index 000000000..ed104ab99
--- /dev/null
+++ b/dev-python/llvmlite/files/llvmlite-0.37.0-llvm12.patch
@@ -0,0 +1,91 @@
+From 1d928ebcd59b23b5050234a2bf71f9be7f5f6bd1 Mon Sep 17 00:00:00 2001
+From: Richard Barnes <rbarnes@×××.edu>
+Date: Wed, 1 Dec 2021 10:29:08 -0700
+Subject: [PATCH] Enable LLVM-12 and LLVM-13
+
+---
+ ffi/build.py                   |  5 ++---
+ ffi/targets.cpp                |  2 ++
+ llvmlite/tests/test_binding.py | 19 ++++++++++++++++---
+ 3 files changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/ffi/build.py b/ffi/build.py
+index 6408bf5f..95e33c64 100755
+--- a/ffi/build.py
++++ b/ffi/build.py
+@@ -162,9 +162,8 @@ def main_posix(kind, library_ext):
+         print(msg)
+         print(warning + '\n')
+     else:
+-
+-        if not out.startswith('11'):
+-            msg = ("Building llvmlite requires LLVM 11.x.x, got "
++        if not (out.startswith('11') or out.startswith('12') or out.startswith('13')):
++            msg = ("Building llvmlite requires LLVM 11-13.x.x, got "
+                    "{!r}. Be sure to set LLVM_CONFIG to the right executable "
+                    "path.\nRead the documentation at "
+                    "http://llvmlite.pydata.org/ for more information about "
+diff --git a/ffi/targets.cpp b/ffi/targets.cpp
+index 1ce472c2..4ba33e79 100644
+--- a/ffi/targets.cpp
++++ b/ffi/targets.cpp
+@@ -233,6 +233,8 @@ LLVMPY_CreateTargetMachine(LLVMTargetRef T,
+         rm = Reloc::DynamicNoPIC;
+ 
+     TargetOptions opt;
++#if LLVM_VERSION_MAJOR < 12
+     opt.PrintMachineCode = PrintMC;
++#endif
+ 
+     bool jit = JIT;
+diff --git a/llvmlite/tests/test_binding.py b/llvmlite/tests/test_binding.py
+index 80495787..fee2372a 100644
+--- a/llvmlite/tests/test_binding.py
++++ b/llvmlite/tests/test_binding.py
+@@ -18,6 +18,16 @@
+ from llvmlite.tests import TestCase
+ 
+ 
++def clean_string_whitespace(x: str) -> str:
++    # Remove trailing whitespace from the end of each line
++    x = re.sub(r"\s+$", "", x, flags=re.MULTILINE)
++    # Remove intermediate blank lines
++    x = re.sub(r"\n\s*\n", r"\n", x, flags=re.MULTILINE)
++    # Remove extraneous whitespace from the beginning and end of the string
++    x = x.strip()
++    return x
++
++
+ # arvm7l needs extra ABI symbols to link successfully
+ if platform.machine() == 'armv7l':
+     llvm.load_library_permanently('libgcc_s.so.1')
+@@ -158,7 +168,7 @@ def no_de_locale():
+ target triple = "unknown-unknown-unknown"
+ target datalayout = ""
+ 
+-define i32 @"foo"() 
++define i32 @"foo"()
+ {
+ "<>!*''#":
+   ret i32 12345
+@@ -424,7 +434,10 @@ def test_nonalphanum_block_name(self):
+         bd = ir.IRBuilder(fn.append_basic_block(name="<>!*''#"))
+         bd.ret(ir.Constant(ir.IntType(32), 12345))
+         asm = str(mod)
+-        self.assertEqual(asm, asm_nonalphanum_blocklabel)
++        self.assertEqual(
++            clean_string_whitespace(asm),
++            clean_string_whitespace(asm_nonalphanum_blocklabel)
++        )
+ 
+     def test_global_context(self):
+         gcontext1 = llvm.context.get_global_context()
+@@ -509,7 +522,7 @@ def test_set_option(self):
+     def test_version(self):
+         major, minor, patch = llvm.llvm_version_info
+         # one of these can be valid
+-        valid = [(11,)]
++        valid = [(11,), (12,), (13,)]
+         self.assertIn((major,), valid)
+         self.assertIn(patch, range(10))
+ 

diff --git a/dev-python/llvmlite/files/llvmlite-0.38.0-llvm12.patch b/dev-python/llvmlite/files/llvmlite-0.38.0-llvm12.patch
new file mode 100644
index 000000000..6630652c2
--- /dev/null
+++ b/dev-python/llvmlite/files/llvmlite-0.38.0-llvm12.patch
@@ -0,0 +1,92 @@
+From 1d928ebcd59b23b5050234a2bf71f9be7f5f6bd1 Mon Sep 17 00:00:00 2001
+From: Richard Barnes <rbarnes@×××.edu>
+Date: Wed, 1 Dec 2021 10:29:08 -0700
+Subject: [PATCH] Enable LLVM-12 and LLVM-13
+
+---
+ ffi/build.py                   |  5 ++---
+ ffi/targets.cpp                |  2 ++
+ llvmlite/tests/test_binding.py | 19 ++++++++++++++++---
+ 3 files changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/ffi/build.py b/ffi/build.py
+index 6408bf5f..95e33c64 100755
+--- a/ffi/build.py
++++ b/ffi/build.py
+@@ -162,9 +162,8 @@ def main_posix(kind, library_ext):
+         print(msg)
+         print(warning + '\n')
+     else:
+-
+-        if not out.startswith('11'):
+-            msg = ("Building llvmlite requires LLVM 11.x.x, got "
++        if not (out.startswith('11') or out.startswith('12') or out.startswith('13')):
++            msg = ("Building llvmlite requires LLVM 11-13.x.x, got "
+                    "{!r}. Be sure to set LLVM_CONFIG to the right executable "
+                    "path.\nRead the documentation at "
+                    "http://llvmlite.pydata.org/ for more information about "
+diff --git a/ffi/targets.cpp b/ffi/targets.cpp
+index 1ce472c2..4ba33e79 100644
+--- a/ffi/targets.cpp
++++ b/ffi/targets.cpp
+@@ -233,7 +233,9 @@ LLVMPY_CreateTargetMachine(LLVMTargetRef T,
+         rm = Reloc::DynamicNoPIC;
+ 
+     TargetOptions opt;
++#if LLVM_VERSION_MAJOR < 12
+     opt.PrintMachineCode = PrintMC;
++#endif
+     opt.MCOptions.ABIName = ABIName;
+ 
+     bool jit = JIT;
+diff --git a/llvmlite/tests/test_binding.py b/llvmlite/tests/test_binding.py
+index 80495787..fee2372a 100644
+--- a/llvmlite/tests/test_binding.py
++++ b/llvmlite/tests/test_binding.py
+@@ -18,6 +18,16 @@
+ from llvmlite.tests import TestCase
+ 
+ 
++def clean_string_whitespace(x: str) -> str:
++    # Remove trailing whitespace from the end of each line
++    x = re.sub(r"\s+$", "", x, flags=re.MULTILINE)
++    # Remove intermediate blank lines
++    x = re.sub(r"\n\s*\n", r"\n", x, flags=re.MULTILINE)
++    # Remove extraneous whitespace from the beginning and end of the string
++    x = x.strip()
++    return x
++
++
+ # arvm7l needs extra ABI symbols to link successfully
+ if platform.machine() == 'armv7l':
+     llvm.load_library_permanently('libgcc_s.so.1')
+@@ -158,7 +168,7 @@ def no_de_locale():
+ target triple = "unknown-unknown-unknown"
+ target datalayout = ""
+ 
+-define i32 @"foo"() 
++define i32 @"foo"()
+ {
+ "<>!*''#":
+   ret i32 12345
+@@ -424,7 +434,10 @@ def test_nonalphanum_block_name(self):
+         bd = ir.IRBuilder(fn.append_basic_block(name="<>!*''#"))
+         bd.ret(ir.Constant(ir.IntType(32), 12345))
+         asm = str(mod)
+-        self.assertEqual(asm, asm_nonalphanum_blocklabel)
++        self.assertEqual(
++            clean_string_whitespace(asm),
++            clean_string_whitespace(asm_nonalphanum_blocklabel)
++        )
+ 
+     def test_global_context(self):
+         gcontext1 = llvm.context.get_global_context()
+@@ -509,7 +522,7 @@ def test_set_option(self):
+     def test_version(self):
+         major, minor, patch = llvm.llvm_version_info
+         # one of these can be valid
+-        valid = [(11,)]
++        valid = [(11,), (12,), (13,)]
+         self.assertIn((major,), valid)
+         self.assertIn(patch, range(10))
+ 

diff --git a/dev-python/llvmlite/llvmlite-0.38.0.ebuild b/dev-python/llvmlite/llvmlite-0.37.0-r1.ebuild
similarity index 95%
rename from dev-python/llvmlite/llvmlite-0.38.0.ebuild
rename to dev-python/llvmlite/llvmlite-0.37.0-r1.ebuild
index cadbc5407..607c1bb0b 100644
--- a/dev-python/llvmlite/llvmlite-0.38.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.37.0-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="examples"
 
-LLVM_MAX_SLOT=11
+LLVM_MAX_SLOT=12
 
 RDEPEND="
 	sys-devel/llvm:${LLVM_MAX_SLOT}
@@ -24,6 +24,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-llvm12.patch" )
+
 src_prepare() {
 	sed -i -e '/max_python/s:3\.10:3.11:' setup.py || die
 	distutils-r1_src_prepare

diff --git a/dev-python/llvmlite/llvmlite-0.37.0.ebuild b/dev-python/llvmlite/llvmlite-0.38.0-r1.ebuild
similarity index 93%
rename from dev-python/llvmlite/llvmlite-0.37.0.ebuild
rename to dev-python/llvmlite/llvmlite-0.38.0-r1.ebuild
index d76175444..607c1bb0b 100644
--- a/dev-python/llvmlite/llvmlite-0.37.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.38.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="examples"
 
-LLVM_MAX_SLOT=11
+LLVM_MAX_SLOT=12
 
 RDEPEND="
 	sys-devel/llvm:${LLVM_MAX_SLOT}
@@ -24,6 +24,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-llvm12.patch" )
+
 src_prepare() {
 	sed -i -e '/max_python/s:3\.10:3.11:' setup.py || die
 	distutils-r1_src_prepare