Attachment 241325 Details for Bug 270670 – proposed patch

[patch] proposed patch

llvm.patch (text/plain), 6.30 KB, created by Pawel Biernacki on 2023-04-06 16:02:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Biernacki

Created: 2023-04-06 16:02:18 UTC

Size: 6.30 KB

patch

obsolete

>diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
>index 91166ab9ccfe..bdb33a4e318f 100644
>--- a/devel/llvm-devel/Makefile
>+++ b/devel/llvm-devel/Makefile
>@@ -54,6 +54,9 @@ SHEBANG_FILES=	\
> 		llvm/tools/opt-viewer/optrecord.py \
> 		llvm/utils/lit/lit.py \
> 		llvm/utils/llvm-lit/llvm-lit.in
>+# Define an underscore variant of LLVM_SUFFIX to be used by parts of the
>+# codebase that doesn't support '-' in names, i.e. python modules.
>+LLVM_U_SUFFIX=	${LLVM_SUFFIX:S/-/_/g}
> 
> SUB_FILES=	llvm-wrapper.sh
> SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>@@ -357,9 +360,9 @@ PLIST_SUB+=	${opt}="@comment "
> .endfor
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
>-	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
>-	    -e 's|lit\.|lit${LLVM_SUFFIX}.|g' \
>+	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_U_SUFFIX}|' \
>+	    -e 's|from lit|from lit${LLVM_U_SUFFIX}|' \
>+	    -e 's|lit\.|lit${LLVM_U_SUFFIX}.|g' \
> 	    ${WRKSRC}/llvm/utils/lit/lit.py \
> 	    ${WRKSRC}/llvm/utils/lit/lit/*.py \
> 	    ${WRKSRC}/llvm/utils/lit/lit/formats/*.py
>@@ -436,15 +439,15 @@ post-install-LIT-on:
> 	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
> 	${LN} -fs ../${LLVM_DIR}/bin/llvm-lit \
> 	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
>-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
>-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
>-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
>+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_U_SUFFIX}
>+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_U_SUFFIX}/builtin_commands
>+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_U_SUFFIX}/formats
> 	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \
>-	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
>+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_U_SUFFIX}
> 	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/builtin_commands/*.py \
>-	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands/
>+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_U_SUFFIX}/builtin_commands/
> 	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/formats/*.py \
>-	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats/
>+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_U_SUFFIX}/formats/
> 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
> 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
> 	${LN} -fs ../${LLVM_DIR}/bin/FileCheck \
>@@ -490,7 +493,7 @@ build-plist:
> 	    -e 's|/${LLVM_MAJOR}/|/%%LLVM_MAJOR%%/|' \
> 	    -e 's|$[-./]$${LLVM_MAJOR:C/\./\\./}$$|\1%%LLVM_MAJOR%%|' \
> 	    | ${SORT} >> ${PLIST}.tmp
>-	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
>+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_U_SUFFIX} -type f | \
> 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
> 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
> 	    -e 's|${LLVM_MAJOR}|%%LLVM_MAJOR%%|' | \
>diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
>index b180578b637b..d31d978ea0cf 100644
>--- a/devel/llvm-devel/pkg-plist
>+++ b/devel/llvm-devel/pkg-plist
>@@ -6183,31 +6183,31 @@ llvm-devel/share/opt-viewer/style.css
> %%CLANG%%llvm-devel/share/scan-view/ScanView.py
> %%CLANG%%llvm-devel/share/scan-view/bugcatcher.ico
> %%CLANG%%llvm-devel/share/scan-view/startfile.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/BooleanExpression.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitConfig.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitTestCase.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ProgressBar.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShCommands.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShUtil.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/Test.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestRunner.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestTimes.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestingConfig.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/__init__.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/builtin_commands/__init__.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/builtin_commands/cat.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/builtin_commands/diff.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/cl_arguments.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/discovery.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/display.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/formats/__init__.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/formats/base.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/formats/googletest.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/formats/shtest.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/main.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/reports.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/run.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/util.py
>-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/worker.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/BooleanExpression.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/LitConfig.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/LitTestCase.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/ProgressBar.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/ShCommands.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/ShUtil.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/Test.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/TestRunner.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/TestTimes.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/TestingConfig.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/__init__.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/builtin_commands/__init__.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/builtin_commands/cat.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/builtin_commands/diff.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/cl_arguments.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/discovery.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/display.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/__init__.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/base.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/googletest.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/formats/shtest.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/main.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/reports.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/run.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/util.py
>+%%LIT%%%%PYTHON_SITELIBDIR%%/lit_devel/worker.py
> @postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
> @postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi

Actions: View | Diff

Attachments on bug 270670: 241325 | 241337