git: aeb2ce7f4b40 - main - devel/llvm-devel: fix packaging with debug python
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 27 Jan 2023 23:54:23 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/ports/commit/?id=aeb2ce7f4b401deff1b71280d147f3d2c2b5fafd
commit aeb2ce7f4b401deff1b71280d147f3d2c2b5fafd
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-01-27 23:53:39 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-01-27 23:53:40 +0000
devel/llvm-devel: 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/llvm-devel/Makefile | 3 ++-
devel/llvm-devel/pkg-plist | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 5e5806bcf893..137e0dad1928 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -151,6 +151,7 @@ LLD_DESC= Install lld, the LLVM linker
LLDB_BUILD_DEPENDS= swig:devel/swig
LLDB_DESC= Install lldb, the LLVM debugger
LLDB_IMPLIES= CLANG
+LLDB_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER}
LLDB_USES= lua:53 libedit
LLDB_USE= GNOME=libxml2
LLDB_VARS= _USES_PYTHON=python:3.6+
@@ -476,7 +477,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|${PORTVERSION}|%%PORTVERSION%%|' \
-e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
-e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 547cef1b4369..8b355594199b 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -137,7 +137,7 @@ bin/sancov-devel
%%LIT%%bin/llvm-lit-devel
%%LIT%%llvm-devel/bin/llvm-lit
%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/__init__.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%.so
+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%%%PYTHON_ABIVER%%.so
%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py
%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py
%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py