Skip to content

Commit

Permalink
devel/llvm-devel: fix packaging with debug python
Browse files Browse the repository at this point in the history
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
  • Loading branch information
brooksdavis committed Jan 27, 2023
1 parent 492cfe3 commit aeb2ce7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion devel/llvm-devel/Makefile
Expand Up @@ -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+
Expand Down Expand Up @@ -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%%|' \
Expand Down
2 changes: 1 addition & 1 deletion devel/llvm-devel/pkg-plist
Expand Up @@ -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
Expand Down

0 comments on commit aeb2ce7

Please sign in to comment.