On 2026/06/12 09:46, Theo Buehler wrote:
> What will become llvmlite 0.48.0 has landed support for llvm/22. 
> The below builds, packages and tests look reasonable (just a few
> skipped ones).
> 
> Not sure what's up with the s/${MODPY_DISTV}/0+unknown/ change in the
> PLIST and what fix that would need.

MODPY_DISTV should be set to whatever's in those filenames, i.e. in this
case "0+unknown".

If there was a version check in downstream software, 0+unknown would
need fixing up to something more like a real version number. There isn't
in miasm, however it's not too hard to do anyway here.

llvmlite's version number comes from "versioneer" which has various
methods to figure out the number - the VCS tool itself for a checkout,
a file generated as part of a release process, the directory
name, or as in this case VCS ID tags replaced by git-archive:
https://github.com/numba/llvmlite/blob/e4eba4f98f36f4ee906c5ecd48527553be52dfad/llvmlite/_version.py#L11

This is a long-winded way of saying, if you use these, it does the right
thing:

MODPY_DISTV =   0.48.0rc1
GH_TAGNAME =    v${MODPY_DISTV}

(it's slightly older than your commit hash, but not by much).

> miasm looks in rather poor shape but it still builds and packages.
> Tests hang.
> 
> For now I suggest we land a fixed version of this update, unhook llvm/20
> from the tree and see if anyone steps up to fix miasm (or at least
> complains). If not, we can also drop both, llvmlite and miasm as already
> discussed.

ok with me.

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-llvmlite/Makefile,v
> diff -u -p -r1.23 Makefile
> --- Makefile	23 Apr 2026 12:00:58 -0000	1.23
> +++ Makefile	12 Jun 2026 07:38:14 -0000
> @@ -1,13 +1,13 @@
>  COMMENT =	lightweight LLVM-Python binding for writing JIT compilers
>  
> -MODPY_DISTV =	0.46.0
> +MODPY_DISTV =	0.48.0pre0
>  GH_ACCOUNT =	numba
>  GH_PROJECT =	llvmlite
> -GH_TAGNAME =	v${MODPY_DISTV}
> +#GH_TAGNAME =	v${MODPY_DISTV}
> +GH_COMMIT =	e4eba4f98f36f4ee906c5ecd48527553be52dfad
> +DISTNAME =	llvmlite-${MODPY_DISTV}
>  PKGNAME =	py-${DISTNAME}
>  
> -REVISION =	0
> -
>  CATEGORIES =	devel
>  
>  MAINTAINER =	Aisha Tammy <aisha@openbsd.org>
> @@ -28,9 +28,7 @@ BUILD_DEPENDS =	devel/cmake/core \
>  		devel/ninja
>  LIB_DEPENDS =	${MODCLANG_LIB_DEPENDS}
>  
> -# llvmlite 0.45.x/0.46.x are for llvm 20.x only
> -# https://github.com/numba/llvmlite?tab=readme-ov-file#compatibility
> -MODCLANG_VERSION= 20
> +MODCLANG_VERSION= 22
>  
>  MODPY_PYBUILD =	setuptools
>  MODPY_PYTEST_ARGS =	llvmlite/tests
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-llvmlite/distinfo,v
> diff -u -p -r1.6 distinfo
> --- distinfo	8 Feb 2026 14:02:40 -0000	1.6
> +++ distinfo	12 Jun 2026 07:37:28 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (llvmlite-0.46.0.tar.gz) = NHM4h/0yWnOS7vabFYedN7AmlOHmsBuhHtZ8OyUSkMU=
> -SIZE (llvmlite-0.46.0.tar.gz) = 309803
> +SHA256 (llvmlite-0.48.0pre0-e4eba4f9.tar.gz) = ePzFQLmF3pQs0hsgE7EEHe9Fpa+03DCBghVhL2jU6NE=
> +SIZE (llvmlite-0.48.0pre0-e4eba4f9.tar.gz) = 313040
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-llvmlite/pkg/PLIST,v
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST	8 Feb 2026 14:02:40 -0000	1.8
> +++ pkg/PLIST	12 Jun 2026 07:37:28 -0000
> @@ -1,13 +1,13 @@
>  @pkgpath devel/py-llvmlite,python3
>  lib/python${MODPY_VERSION}/site-packages/llvmlite/
> -lib/python${MODPY_VERSION}/site-packages/llvmlite-${MODPY_DISTV}.dist-info/
> -lib/python${MODPY_VERSION}/site-packages/llvmlite-${MODPY_DISTV}.dist-info/METADATA
> -lib/python${MODPY_VERSION}/site-packages/llvmlite-${MODPY_DISTV}.dist-info/RECORD
> -lib/python${MODPY_VERSION}/site-packages/llvmlite-${MODPY_DISTV}.dist-info/WHEEL
> -lib/python${MODPY_VERSION}/site-packages/llvmlite-${MODPY_DISTV}.dist-info/licenses/
> -lib/python${MODPY_VERSION}/site-packages/llvmlite-${MODPY_DISTV}.dist-info/licenses/LICENSE
> -lib/python${MODPY_VERSION}/site-packages/llvmlite-${MODPY_DISTV}.dist-info/licenses/LICENSE.thirdparty
> -lib/python${MODPY_VERSION}/site-packages/llvmlite-${MODPY_DISTV}.dist-info/top_level.txt
> +lib/python${MODPY_VERSION}/site-packages/llvmlite-0+unknown.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/llvmlite-0+unknown.dist-info/METADATA
> +lib/python${MODPY_VERSION}/site-packages/llvmlite-0+unknown.dist-info/RECORD
> +lib/python${MODPY_VERSION}/site-packages/llvmlite-0+unknown.dist-info/WHEEL
> +lib/python${MODPY_VERSION}/site-packages/llvmlite-0+unknown.dist-info/licenses/
> +lib/python${MODPY_VERSION}/site-packages/llvmlite-0+unknown.dist-info/licenses/LICENSE
> +lib/python${MODPY_VERSION}/site-packages/llvmlite-0+unknown.dist-info/licenses/LICENSE.thirdparty
> +lib/python${MODPY_VERSION}/site-packages/llvmlite-0+unknown.dist-info/top_level.txt
>  lib/python${MODPY_VERSION}/site-packages/llvmlite/__init__.py
>  lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}/
>  lib/python${MODPY_VERSION}/site-packages/llvmlite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}