svn commit: r566424 - head/devel/shiboken2

[Christoph Moench-Tegeder]

Author: cmt
Date: Tue Feb 23 19:35:31 2021
New Revision: 566424
URL: https://svnweb.freebsd.org/changeset/ports/566424

Log:
  devel/shiboken2: depend on correct llvm port
  
  between shiboken2's build system picking the highest versioned
  llvm-config available and pkg registering a dependency on the
  highest versioned libclang.so available, we need to
  - pass the correct llvm-config via cmake variable and not via
    environment, as the environment variable is not used by
    shiboken's build system
  - specify the dependency on libclang.so with it's version number; and
    to avoid breaking (or requiring manual intervention) with the next
    LLVM_DEFAULT switch, extract that version number from LLVM_DEFAULT
    in a way that should be working for llvm versions from 6 to 59
    (unless we choose to change our llvm port naming scheme), which
    seems to give us some safety margin.
  
  PR:		253749
  Approved by:	lbartoletti (kde@)

Modified:
  head/devel/shiboken2/Makefile

Modified: head/devel/shiboken2/Makefile
==============================================================================
--- head/devel/shiboken2/Makefile	Tue Feb 23 19:09:01 2021	(r566423)
+++ head/devel/shiboken2/Makefile	Tue Feb 23 19:35:31 2021	(r566424)
@@ -2,6 +2,7 @@
 
 PORTNAME=	shiboken2
 DISTVERSION=	5.15.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,7 @@ BROKEN_riscv64=		fails to compile: __threading_support
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		git>0:devel/git
-LIB_DEPENDS=	libclang.so:devel/llvm${LLVM_DEFAULT} \
+LIB_DEPENDS=	libclang.so.${LLVM_DEFAULT:C/^([6-9])0/\1/}:devel/llvm${LLVM_DEFAULT} \
 		libxslt.so:textproc/libxslt
 
 USES=		cmake compiler:c++11-lang gnome python:3.5+ qt:5 shebangfix tar:xz
@@ -29,11 +30,11 @@ USE_QT=		buildtools_build core gui network qmake_build
 
 SHEBANG_FILES=	shiboken_tool.py
 
-CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}
 CMAKE_ARGS+=	"-DCMAKE_CXX_FLAGS=-lexecinfo" \
 		"-DCMAKE_STANDARD_LIBRARIES=-lexecinfo" \
 		"-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" \
-		"-DUSE_PYTHON_VERSION=${PYTHON_VER}"
+		"-DUSE_PYTHON_VERSION=${PYTHON_VER}" \
+		"-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}"
 
 .include <bsd.port.pre.mk>