Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Jan 2023 23:39:36 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6629f8d3d65b - main - devel/llvm15: fix packaging with debug python
Message-ID:  <202301302339.30UNda2Z073701@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6629f8d3d65b6f010d2bd1012c847c47ab66f242

commit 6629f8d3d65b6f010d2bd1012c847c47ab66f242
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-01-30 23:38:36 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-01-30 23:38:36 +0000

    devel/llvm15: fix packaging with debug python
    
    The actual suffix if python extensions (at least as built by the LLVM
    infrastructure) is ${PYTHON_EXT_SUFFIX}${PYTHON_ABIVER} not merely the
    former.
    
    PR:             268437
    Sponsored by:   DARPA
---
 devel/llvm15/Makefile  | 3 ++-
 devel/llvm15/pkg-plist | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile
index 7401e536d3e1..6fa0254c0d9a 100644
--- a/devel/llvm15/Makefile
+++ b/devel/llvm15/Makefile
@@ -170,6 +170,7 @@ LLDB_CMAKE_ON=		-DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \
 			-DPANEL_LIBRARIES=/usr/lib/libpanel.so
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_IMPLIES=		CLANG
+LLDB_PLIST_SUB=		PYTHON_ABIVER=${PYTHON_ABIVER}
 LLDB_USES=		lua:53 libedit
 LLDB_VARS=		_USES_PYTHON=python:3.6+
 MLIR_DESC=		Multi-Level Intermediate Representation
@@ -703,7 +704,7 @@ build-plist:
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
 	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
-	    -e 's|${PYTHON_EXT_SUFFIX:C/\./\\./g}|%%PYTHON_EXT_SUFFIX%%|' \
+	    -e 's|${PYTHON_EXT_SUFFIX:C/\./\\./g}${PYTHON_ABIVER}|%%PYTHON_EXT_SUFFIX%%%%PYTHON_ABIVER%%|' \
 	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
 	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
diff --git a/devel/llvm15/pkg-plist b/devel/llvm15/pkg-plist
index 6632bb4aad85..aa17d715ff74 100644
--- a/devel/llvm15/pkg-plist
+++ b/devel/llvm15/pkg-plist
@@ -141,7 +141,7 @@ bin/split-file%%LLVM_SUFFIX%%
 %%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/cindex.py
 %%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/enumerations.py
 %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/__init__.py
-%%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%.so
+%%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%%%PYTHON_ABIVER%%.so
 %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py
 %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py
 %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301302339.30UNda2Z073701>