Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/llvmlite/files/, dev-python/llvmlite/
Date: Fri, 01 May 2020 08:54:10
Message-Id: 1588323213.243e4816f562279a2fa56613c91c92f66324236c.mgorny@gentoo
1 commit: 243e4816f562279a2fa56613c91c92f66324236c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 1 08:34:25 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri May 1 08:53:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=243e4816
7
8 dev-python/llvmlite: Remove old (LLVM 7)
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/llvmlite/Manifest | 1 -
13 .../llvmlite/files/llvmlite-0.28.0-llvm710.patch | 59 --------------------
14 dev-python/llvmlite/llvmlite-0.28.0.ebuild | 63 ----------------------
15 3 files changed, 123 deletions(-)
16
17 diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
18 index aa63505e0fa..aee8d21a2e8 100644
19 --- a/dev-python/llvmlite/Manifest
20 +++ b/dev-python/llvmlite/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST llvmlite-0.28.0.gh.tar.gz 191141 BLAKE2B 23c86c28311a4e8c7f9c209a7ed7816ad5002c26f9fda7a47cf2b54c4578db28ed0781b54a716726db8a7c1abce79a79a99c3f5bf4be2a61d547eb74d06cb507 SHA512 c00c767c80a507975a055088ca4328766c992e7267219dea54376daf5eb11397532b243352976d3569185149007650d5e94839b61aa55502e1991f72b1ba492a
23 DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
24 DIST llvmlite-0.30.0.gh.tar.gz 199354 BLAKE2B 71ba1b0572d115a28d838a7fa5daca136fb793d41cdebca5834d2977813b4a02837e99d8b1b48d0fa965c5d3bdfe7783314ecbd2a7e7075b82247ea5fa4f90a4 SHA512 e3a64a3170efe1bffb6eeb8d6cfdc5a9bf8cc9e123da0b317b6b8dd93dacd3a54d5117c22eca43226915e7ff2793ab66cdee00c5e6ada442d9c2f7fed6e40763
25
26 diff --git a/dev-python/llvmlite/files/llvmlite-0.28.0-llvm710.patch b/dev-python/llvmlite/files/llvmlite-0.28.0-llvm710.patch
27 deleted file mode 100644
28 index db06adb41c1..00000000000
29 --- a/dev-python/llvmlite/files/llvmlite-0.28.0-llvm710.patch
30 +++ /dev/null
31 @@ -1,59 +0,0 @@
32 -From 3845caca60120a8f9a094833e44bc4184b1d6827 Mon Sep 17 00:00:00 2001
33 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
34 -Date: Sun, 21 Apr 2019 13:56:00 +0200
35 -Subject: [PATCH] Permit building against LLVM 7.1.0
36 -
37 -Restrict building to any 7.* version rather than 7.0.*, as 7.1.0 has
38 -been released that is API-compatible with 7.0.*.
39 ----
40 - README.rst | 2 +-
41 - ffi/build.py | 4 ++--
42 - llvmlite/tests/test_binding.py | 3 ++-
43 - 3 files changed, 5 insertions(+), 4 deletions(-)
44 -
45 -diff --git a/README.rst b/README.rst
46 -index 2462e3f..8e551eb 100644
47 ---- a/README.rst
48 -+++ b/README.rst
49 -@@ -70,7 +70,7 @@ Historical compatibility table:
50 - ================= ========================
51 - llvmlite versions compatible LLVM versions
52 - ================= ========================
53 --0.27.0 - ... 7.0.x
54 -+0.27.0 - ... 7.y.x
55 - 0.23.0 - 0.26.0 6.0.x
56 - 0.21.0 - 0.22.0 5.0.x
57 - 0.17.0 - 0.20.0 4.0.x
58 -diff --git a/ffi/build.py b/ffi/build.py
59 -index 7d5247d..a87e857 100755
60 ---- a/ffi/build.py
61 -+++ b/ffi/build.py
62 -@@ -109,9 +109,9 @@ def main_posix(kind, library_ext):
63 -
64 - out = out.decode('latin1')
65 - print(out)
66 -- if not out.startswith('7.0.'):
67 -+ if not out.startswith('7.'):
68 - msg = (
69 -- "Building llvmlite requires LLVM 7.0.x. Be sure to "
70 -+ "Building llvmlite requires LLVM 7.y.x. Be sure to "
71 - "set LLVM_CONFIG to the right executable path.\n"
72 - "Read the documentation at http://llvmlite.pydata.org/ for more "
73 - "information about building llvmlite.\n"
74 -diff --git a/llvmlite/tests/test_binding.py b/llvmlite/tests/test_binding.py
75 -index 335c30d..134f356 100644
76 ---- a/llvmlite/tests/test_binding.py
77 -+++ b/llvmlite/tests/test_binding.py
78 -@@ -339,7 +339,8 @@ class TestMisc(BaseTest):
79 -
80 - def test_version(self):
81 - major, minor, patch = llvm.llvm_version_info
82 -- self.assertEqual((major, minor), (7, 0))
83 -+ self.assertEqual(major, 7)
84 -+ self.assertIn(minor, (0, 1))
85 - self.assertIn(patch, range(10))
86 -
87 - def test_check_jit_execution(self):
88 ---
89 -2.21.0
90 -
91
92 diff --git a/dev-python/llvmlite/llvmlite-0.28.0.ebuild b/dev-python/llvmlite/llvmlite-0.28.0.ebuild
93 deleted file mode 100644
94 index ccc4a40f973..00000000000
95 --- a/dev-python/llvmlite/llvmlite-0.28.0.ebuild
96 +++ /dev/null
97 @@ -1,63 +0,0 @@
98 -# Copyright 1999-2020 Gentoo Authors
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI=6
102 -
103 -PYTHON_COMPAT=( python{3_6,3_7} )
104 -
105 -inherit distutils-r1 llvm
106 -
107 -DESCRIPTION="Python wrapper around the llvm C++ library"
108 -HOMEPAGE="http://llvmlite.pydata.org/"
109 -SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
110 -
111 -LICENSE="BSD"
112 -SLOT="0"
113 -KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
114 -IUSE="examples"
115 -
116 -LLVM_MAX_SLOT=7
117 -
118 -RDEPEND="
119 - dev-python/six[${PYTHON_USEDEP}]
120 - sys-devel/llvm:${LLVM_MAX_SLOT}
121 - sys-libs/zlib:0=
122 -"
123 -DEPEND="${RDEPEND}
124 - dev-python/setuptools[${PYTHON_USEDEP}]
125 -"
126 -
127 -S=${WORKDIR}/${P/_/}
128 -
129 -PATCHES=(
130 - "${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
131 - "${FILESDIR}"/llvmlite-0.28.0-llvm710.patch
132 -)
133 -
134 -python_configure_all() {
135 - # upstream's build system is just horrible, and they ignored the PR
136 - # fixing it, so let's build the shared lib properly using implicit
137 - # make rules
138 -
139 - export LDLIBS=$(llvm-config --libs all)
140 - export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
141 - export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
142 -
143 - local files=( ffi/*.cpp )
144 - emake -f - <<EOF
145 -ffi/libllvmlite.so: ${files[*]/.cpp/.o}
146 - \$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
147 -EOF
148 -}
149 -
150 -python_test() {
151 - "${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
152 -}
153 -
154 -python_install_all() {
155 - distutils-r1_python_install_all
156 - if use examples; then
157 - dodoc -r examples
158 - docompress -x /usr/share/doc/${PF}/examples
159 - fi
160 -}