diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2023-01-30 23:38:37 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2023-01-30 23:39:26 +0000 |
| commit | c16e3dc045cfe2485d4021ad205d58be276dba02 (patch) | |
| tree | 92f20a3fb5d585814746cbc8aff32e44798b2546 | |
| parent | 08cc10d5b77c4ff634dbd6b3c2e7c3105f6627f8 (diff) | |
| download | ports-c16e3dc045cfe2485d4021ad205d58be276dba02.tar.gz ports-c16e3dc045cfe2485d4021ad205d58be276dba02.zip | |
devel/llvm14: 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
| -rw-r--r-- | devel/llvm14/Makefile | 3 | ||||
| -rw-r--r-- | devel/llvm14/pkg-plist | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index f65880ef6c4e..78473f4f3e70 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -168,6 +168,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 @@ -624,7 +625,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/llvm14/pkg-plist b/devel/llvm14/pkg-plist index 21dcc4b7ddc9..6fb76997810d 100644 --- a/devel/llvm14/pkg-plist +++ b/devel/llvm14/pkg-plist @@ -133,7 +133,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 |