Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

llvmlite v0.39.0 #62

Merged
merged 9 commits into from
Aug 12, 2022
Merged
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 21 additions & 48 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 22 additions & 8 deletions LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 13 additions & 6 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

7 changes: 4 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "llvmlite" %}
{% set version = "0.38.1" %}
{% set sha256 = "0622a86301fcf81cc50d7ed5b4bebe992c030580d413a8443b328ed4f4d82561" %}
{% set version = "0.39.0" %}
{% set sha256 = "01098be54f1aa25e391cebba8ea71cd1533f8cd1f50e34c7dd7540c2560a93af" %}

package:
name: {{ name|lower }}
Expand All @@ -11,7 +11,8 @@ source:
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
sha256: {{ sha256 }}
patches:
- 0001-Add-add_dll_directory-for-LIBRARY_BIN-for-Py38-on-Windows.patch # [win and py>=38]
# https://github.com/conda-forge/llvmlite-feedstock/pull/62#issuecomment-1209762518
- patches/0001-Disable-test_libm-on-macOS.patch
Comment on lines 13 to +15
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This patch is also in PR ( numba/llvmlite#870 ) for reference.


build:
number: 0
Expand Down
33 changes: 0 additions & 33 deletions recipe/patch_cmake.patch

This file was deleted.

34 changes: 34 additions & 0 deletions recipe/patches/0001-Disable-test_libm-on-macOS.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From e3648a827115539c368ee13d8b791f45d1afea69 Mon Sep 17 00:00:00 2001
From: John Kirkham <jakirkham@gmail.com>
Date: Fri, 12 Aug 2022 09:31:14 -0700
Subject: [PATCH] Disable `test_libm` on macOS

---
llvmlite/tests/test_binding.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/llvmlite/tests/test_binding.py b/llvmlite/tests/test_binding.py
index 28b2f5f..b3018c8 100644
--- a/llvmlite/tests/test_binding.py
+++ b/llvmlite/tests/test_binding.py
@@ -1633,14 +1633,11 @@ class TestDylib(BaseTest):
with self.assertRaises(RuntimeError):
llvm.load_library_permanently("zzzasdkf;jasd;l")

- @unittest.skipUnless(platform.system() in ["Linux", "Darwin"],
- "test only works on Linux and Darwin")
+ @unittest.skipUnless(platform.system() in ["Linux"],
+ "test only works on Linux")
def test_libm(self):
system = platform.system()
- if system == "Linux":
- libm = find_library("m")
- elif system == "Darwin":
- libm = find_library("libm")
+ libm = find_library("m")
llvm.load_library_permanently(libm)


--
2.37.1

2 changes: 1 addition & 1 deletion recipe/run_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
from llvmlite.tests import main

# Disable tests for distribution only
# These check for static linkage, which don't do.
# These check for static linkage, which we don't do.
os.environ['LLVMLITE_DIST_TEST'] = ''
main()