Hi,
Attached diff for py-llvmlite update to latest
It has been broken for a bit and am not sure if maintainer is too busy for this.
If needed I can take this port, I am generally in touch with upstream to bug
them
about their JIT compiler numba.
Would be nice to see it in 6.8 as its working now.
All tests are passing as well.
(also attaching the patch just in case thunderbird still messes up)
Aisha
diff --git a/devel/py-llvmlite/Makefile b/devel/py-llvmlite/Makefile
index c20460f77e8..5f152a0b79f 100644
--- a/devel/py-llvmlite/Makefile
+++ b/devel/py-llvmlite/Makefile
@@ -1,10 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2020/08/22 22:06:01 naddy Exp $
-BROKEN = requires update to 0.34.0 for LLVM 10
COMMENT = lightweight LLVM-Python binding for writing JIT compilers
-MODPY_EGG_VERSION = 0.29.0
-REVISION = 1
+MODPY_EGG_VERSION = 0.34.0
GH_ACCOUNT = numba
GH_PROJECT = llvmlite
GH_TAGNAME = v${MODPY_EGG_VERSION}
@@ -19,20 +17,24 @@ HOMEPAGE = http://llvmlite.pydata.org/
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} LLVM m
+WANTLIB += ${COMPILER_LIBCXX} LLVM m
COMPILER = base-clang
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-BUILD_DEPENDS += devel/py-enum34
-RUN_DEPENDS += devel/py-enum34
-.endif
-
-MAKE_ENV = LLVM_CONFIG="/usr/bin/llvm-config"
+FLAVOR ?= python3
+
+COMMON_ENV = LLVM_CONFIG="/usr/bin/llvm-config" \
+ LDLIBS="`llvm-config --libs all`" \
+ CXXFLAGS="`llvm-config --cxxflags` -fPIC ${CXXFLAGS}" \
+ LDFLAGS="`llvm-config --ldflags`"
+CONFIGURE_ENV += ${COMMON_ENV}
+MAKE_ENV += ${COMMON_ENV}
+
+pre-build:
+ cd ${WRKSRC} && env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
+ -f LIB_MAKEFILE
do-test:
cd ${WRKSRC} && PYTHONPATH=. ${SETENV} ${MODPY_BIN} ./runtests.py
diff --git a/devel/py-llvmlite/distinfo b/devel/py-llvmlite/distinfo
index 464df2c98f1..4e116070593 100644
--- a/devel/py-llvmlite/distinfo
+++ b/devel/py-llvmlite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvmlite-0.29.0.tar.gz) = vO54HC3Ga+09tbqF9cBMTv/TjHwQ9Sh+6+qBy029zjQ=
-SIZE (llvmlite-0.29.0.tar.gz) = 196507
+SHA256 (llvmlite-0.34.0.tar.gz) = rqXDPVkUW5YlHRGXG60m2BgQliq2g9EHtu9KGEctPZo=
+SIZE (llvmlite-0.34.0.tar.gz) = 210438
diff --git a/devel/py-llvmlite/patches/patch-LIB_MAKEFILE
b/devel/py-llvmlite/patches/patch-LIB_MAKEFILE
new file mode 100644
index 00000000000..0e491ddbf54
--- /dev/null
+++ b/devel/py-llvmlite/patches/patch-LIB_MAKEFILE
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+upstream libllvmlite.so doesn't build nicely
+
+Index: config_makefile
+--- LIB_MAKEFILE.orig
++++ LIB_MAKEFILE
+@@ -0,0 +1,5 @@
++SRC=ffi/*.cpp
++
++ffi/libllvmlite.so:
++ $(CXX) -shared $(CXXFLAGS) $(LDFLAGS) -o $@ $(SRC) $(LDLIBS)
++
diff --git a/devel/py-llvmlite/pkg/PLIST b/devel/py-llvmlite/pkg/PLIST
index dcbc4e9780d..1a56a66754b 100644
--- a/devel/py-llvmlite/pkg/PLIST
+++ b/devel/py-llvmlite/pkg/PLIST
@@ -5,7 +5,6 @@ lib/python${MODPY_VERSION}/site-packages/llvmlite/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/llvmlite/_version.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/
@@ -34,7 +33,7 @@
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/dylib.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/executionengine.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/ffi.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/initfini.py
-lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/libllvmlite.so
+@so lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/libllvmlite.so
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/linker.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/module.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/object_file.py
@@ -71,7 +70,6 @@
lib/python${MODPY_VERSION}/site-packages/llvmlite/llvmpy/${MODPY_PYCACHE}core.${
lib/python${MODPY_VERSION}/site-packages/llvmlite/llvmpy/${MODPY_PYCACHE}passes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/llvmlite/llvmpy/core.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/llvmpy/passes.py
-lib/python${MODPY_VERSION}/site-packages/llvmlite/six.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/tests/
lib/python${MODPY_VERSION}/site-packages/llvmlite/tests/__init__.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/tests/__main__.py
diff --git a/devel/py-llvmlite/Makefile b/devel/py-llvmlite/Makefile
index c20460f77e8..5f152a0b79f 100644
--- a/devel/py-llvmlite/Makefile
+++ b/devel/py-llvmlite/Makefile
@@ -1,10 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2020/08/22 22:06:01 naddy Exp $
-BROKEN = requires update to 0.34.0 for LLVM 10
COMMENT = lightweight LLVM-Python binding for writing JIT compilers
-MODPY_EGG_VERSION = 0.29.0
-REVISION = 1
+MODPY_EGG_VERSION = 0.34.0
GH_ACCOUNT = numba
GH_PROJECT = llvmlite
GH_TAGNAME = v${MODPY_EGG_VERSION}
@@ -19,20 +17,24 @@ HOMEPAGE = http://llvmlite.pydata.org/
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} LLVM m
+WANTLIB += ${COMPILER_LIBCXX} LLVM m
COMPILER = base-clang
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-BUILD_DEPENDS += devel/py-enum34
-RUN_DEPENDS += devel/py-enum34
-.endif
-
-MAKE_ENV = LLVM_CONFIG="/usr/bin/llvm-config"
+FLAVOR ?= python3
+
+COMMON_ENV = LLVM_CONFIG="/usr/bin/llvm-config" \
+ LDLIBS="`llvm-config --libs all`" \
+ CXXFLAGS="`llvm-config --cxxflags` -fPIC ${CXXFLAGS}" \
+ LDFLAGS="`llvm-config --ldflags`"
+CONFIGURE_ENV += ${COMMON_ENV}
+MAKE_ENV += ${COMMON_ENV}
+
+pre-build:
+ cd ${WRKSRC} && env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
+ -f LIB_MAKEFILE
do-test:
cd ${WRKSRC} && PYTHONPATH=. ${SETENV} ${MODPY_BIN} ./runtests.py
diff --git a/devel/py-llvmlite/distinfo b/devel/py-llvmlite/distinfo
index 464df2c98f1..4e116070593 100644
--- a/devel/py-llvmlite/distinfo
+++ b/devel/py-llvmlite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvmlite-0.29.0.tar.gz) = vO54HC3Ga+09tbqF9cBMTv/TjHwQ9Sh+6+qBy029zjQ=
-SIZE (llvmlite-0.29.0.tar.gz) = 196507
+SHA256 (llvmlite-0.34.0.tar.gz) = rqXDPVkUW5YlHRGXG60m2BgQliq2g9EHtu9KGEctPZo=
+SIZE (llvmlite-0.34.0.tar.gz) = 210438
diff --git a/devel/py-llvmlite/patches/patch-LIB_MAKEFILE b/devel/py-llvmlite/patches/patch-LIB_MAKEFILE
new file mode 100644
index 00000000000..0e491ddbf54
--- /dev/null
+++ b/devel/py-llvmlite/patches/patch-LIB_MAKEFILE
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+upstream libllvmlite.so doesn't build nicely
+
+Index: config_makefile
+--- LIB_MAKEFILE.orig
++++ LIB_MAKEFILE
+@@ -0,0 +1,5 @@
++SRC=ffi/*.cpp
++
++ffi/libllvmlite.so:
++ $(CXX) -shared $(CXXFLAGS) $(LDFLAGS) -o $@ $(SRC) $(LDLIBS)
++
diff --git a/devel/py-llvmlite/pkg/PLIST b/devel/py-llvmlite/pkg/PLIST
index dcbc4e9780d..1a56a66754b 100644
--- a/devel/py-llvmlite/pkg/PLIST
+++ b/devel/py-llvmlite/pkg/PLIST
@@ -5,7 +5,6 @@ lib/python${MODPY_VERSION}/site-packages/llvmlite/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/llvmlite/_version.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/
@@ -34,7 +33,7 @@ lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/dylib.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/executionengine.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/ffi.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/initfini.py
-lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/libllvmlite.so
+@so lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/libllvmlite.so
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/linker.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/module.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/binding/object_file.py
@@ -71,7 +70,6 @@ lib/python${MODPY_VERSION}/site-packages/llvmlite/llvmpy/${MODPY_PYCACHE}core.${
lib/python${MODPY_VERSION}/site-packages/llvmlite/llvmpy/${MODPY_PYCACHE}passes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/llvmlite/llvmpy/core.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/llvmpy/passes.py
-lib/python${MODPY_VERSION}/site-packages/llvmlite/six.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/tests/
lib/python${MODPY_VERSION}/site-packages/llvmlite/tests/__init__.py
lib/python${MODPY_VERSION}/site-packages/llvmlite/tests/__main__.py
