Attachment 159389 Details for Bug 201986 – llvm-devel.diff

[patch] llvm-devel.diff

llvm-devel.diff (text/plain), 5.87 KB, created by Mathieu Arnold on 2015-07-30 08:53:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2015-07-30 08:53:51 UTC

Size: 5.87 KB

patch

obsolete

>Index: devel/llvm-devel/Makefile
>===================================================================
>--- devel/llvm-devel/Makefile	(revision 393223)
>+++ devel/llvm-devel/Makefile	(working copy)
>@@ -44,20 +44,27 @@
> CLANG_DESC=	Build clang
> CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
> CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
>-_CLANG_GH_PROJECT=	clang:clang
>-_CLANG_GH_TAGNAME=	${CLANG_COMMIT}:clang
>+CLANG_GH_PROJECT=	clang:clang
>+CLANG_GH_TAGNAME=	${CLANG_COMMIT}:clang
>+CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
>+CLANG_PORTDOCS=		clang
>+DOCS_PORTDOCS=		llvm
>+DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
>+			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
>+			-DLLVM_BUILD_DOCS=ON
>+DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
> LIT_DESC=		Install lit and FileCheck test tools
> LLD_DESC=		Install lld, the LLVM linker
>-_LLD_GH_PROJECT=		lld:lld
>-_LLD_GH_TAGNAME=		${LLD_COMMIT}:lld
>+LLD_GH_PROJECT=		lld:lld
>+LLD_GH_TAGNAME=		${LLD_COMMIT}:lld
> LLDB_DESC=		Install lldb, the LLVM debugger
> LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
>-_LLDB_GH_PROJECT=	lldb:lldb
>-_LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
>+LLDB_GH_PROJECT=	lldb:lldb
>+LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
> OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
> OPENMP_CONFLICTS_INSTALL=	libiomp5-devel-*
>-_OPENMP_GH_PROJECT=	openmp:openmp
>-_OPENMP_GH_TAGNAME=	${OPENMP_COMMIT}:openmp
>+OPENMP_GH_PROJECT=	openmp:openmp
>+OPENMP_GH_TAGNAME=	${OPENMP_COMMIT}:openmp
> 
> OPTIONS_SUB=	yes
> 
>@@ -112,19 +119,8 @@
> 		clang-cpp \
> 		clang-format
> MAN1SRCS+=	clang.1
>-PORTDOCS+=	clang
>-CMAKE_ARGS+=	-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
>-GH_PROJECT+=	${_CLANG_GH_PROJECT}
>-GH_TAGNAME+=	${_CLANG_GH_TAGNAME}
> .endif
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-PORTDOCS+=	llvm
>-CMAKE_ARGS+=	-DLLVM_ENABLE_SPHINX=ON \
>-		-DSPHINX_WARNINGS_AS_ERRORS=OFF \
>-		-DLLVM_BUILD_DOCS=ON
>-.endif
>-
> .if ${PORT_OPTIONS:MLIT}
> MAN1SRCS+=	lit.1 FileCheck.1
> _USES_PYTHON=	python
>@@ -134,8 +130,6 @@
> .if ${PORT_OPTIONS:MLLD}
> COMMANDS+=	lld
> PORTDOCS+=	lld
>-GH_PROJECT+=	${_LLD_GH_PROJECT}
>-GH_TAGNAME+=	${_LLD_GH_TAGNAME}
> .endif
> 
> .if ${PORT_OPTIONS:MLLDB}
>@@ -144,8 +138,6 @@
> 		lldb-mi \
> 		lldb-server
> _USES_PYTHON=	python
>-GH_PROJECT+=	${_LLDB_GH_PROJECT}
>-GH_TAGNAME+=	${_LLDB_GH_TAGNAME}
> .endif
> 
> .if ! ${OPTIONS_DEFINE:MOPENMP}
>@@ -152,8 +144,6 @@
> # Hack to disable OPENMP in plist of unsupported architectures
> PLIST_SUB+=    OPENMP="@comment "
> .else
>-GH_PROJECT+=	${_OPENMP_GH_PROJECT}
>-GH_TAGNAME+=	${_OPENMP_GH_TAGNAME}
> .endif
> 
> _USES_PYTHON?=	python:build
>@@ -165,9 +155,6 @@
> 		llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-nm.1 \
> 		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
> 		opt.1 tblgen.1
>-.if ${PORT_OPTIONS:MDOCS}
>-PLIST_FILES+=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
>-.endif
> 
> NOT_FOR_ARCH=	ia64
> 
>@@ -177,19 +164,17 @@
> BROKEN=	GCC failing on 8.x
> .endif
> 
>-post-extract:
>-.if ${PORT_OPTIONS:MCLANG}
>+post-extract-CLANG-on:
> 	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
>-.endif
>-.if ${PORT_OPTIONS:MLLD}
>+
>+post-extract-LLD-on:
> 	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
>-.endif
>-.if ${PORT_OPTIONS:MLLDB}
>+
>+post-extract-LLDB-on:
> 	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
>-.endif
>-.if ${PORT_OPTIONS:MOPENMP}
>+
>+post-extract-OPENMP-on:
> 	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp
>-.endif
> 
> post-patch:
> 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
>@@ -198,10 +183,6 @@
> 	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py
> 
> post-install:
>-.if ${PORT_OPTIONS:MCLANG}
>-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
>-	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
>-.endif
> 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
> 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
> .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
>@@ -209,7 +190,24 @@
> 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
> 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
> .endfor
>-.if ${PORT_OPTIONS:MLIT}
>+
>+post-install-DOCS-on:
>+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
>+.for _man in ${MAN1SRCS}
>+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
>+	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
>+.endfor
>+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
>+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
>+
>+post-install-LLDB-on:
>+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
>+
>+post-install-CLANG-on:
>+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
>+	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
>+
>+post-install-LIT-on:
> 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
> 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
> 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
>@@ -225,30 +223,10 @@
> 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
> 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
> 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
>-.else
>+
>+post-install-LIT-off:
> 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
> 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
>-.endif
>-.if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/llvm ${STAGEDIR}${DOCSDIR}
>-.if ${PORT_OPTIONS:MCLANG}
>-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/clang ${STAGEDIR}${DOCSDIR}
>-.endif
>-.if ${PORT_OPTIONS:MLLD}
>-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/lld ${STAGEDIR}${DOCSDIR}
>-.endif
>-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc
>-.for _man in ${MAN1SRCS}
>-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
>-	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
>-.endfor
>-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
>-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
>-.endif
>-.if ${PORT_OPTIONS:MLLDB}
>-	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
>-.endif
> 
> TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
> regression-test: ${BUILD_COOKIE}

Actions: View | Diff

Attachments on bug 201986: 159389