From nobody Sun Apr 02 02:23:56 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PpyWd0TTyz43lqq; Sun, 2 Apr 2023 02:23:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PpyWc48nMz3QyV; Sun, 2 Apr 2023 02:23:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680402236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bM/p/GG0VgvNbxXYQyb940pnv4m1F0H2mLsQooDk1dc=; b=tjuBlmWnTCJ3xpmcY/2AZWeSTyXkLOc9fbrH7MzmQZLBB2+IKC58o02jndnCN0tFIkcGrL 9hxet/M3uxj67d5Yajv1+XwM82bv1f6sXM5XALe64cJFfQHBQ2ORG5GgqO8qRIMBLnsfPS 3UJEGoQQlD77hfiONVx6hnLVjyf5aGxibvEYteYL3IQfvBck8/wCggwB7HmUy0dY8qlmzd 1weO76Ce11ZAneEKUmhm95AZ9r3w42tVBMvp79FAMq944pgnQtGvITp282Qj0Z1kOcRSrx /jBhzExcoqFFwLVZk2dXVSpjxM26mcAP7wZvOl9/mAvbQLfjOjLkRo6+G+Rtng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680402236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bM/p/GG0VgvNbxXYQyb940pnv4m1F0H2mLsQooDk1dc=; b=X9knXglIhGZujP0bMG1ASVaTANUDr5c4yHeSFhZck+OFxto4MGyJv/0RB/uysFZiPqnaC+ 8z1VvGH+ctybEFuYwiSWUYbBjs3CclZ4uEgdElG6+cZpA2U+OaClBK7egKlncUqsS1YytY 4bkmUDHf7KPv3Oskf8baxy8RejYALkYCZ2XTwYDTG94g2cXObKaeBJWbM5/P2u5CFrqaku sKD2pqSFpyNAk4kZsFzb/qanI34jsGrto8QjR9Xu1HkqUpVMsQuFwZ10HpPkiqMroFfncT 9PrutAA5UBdS4tRLOc/ZZZZvzOKivDFPt8eUwz5NJD/kkl9Fgsz+PxPLNtwS3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680402236; a=rsa-sha256; cv=none; b=LftcwHbKjNnpAo1xV7tzBp2/JwO3XanrhOrWVQ5fzuLWgLVmgNwu62hoWzVdUUs0D8l1S7 WL5fF896EhEY+F9mGr/aJmC54asMeVcCzr8M3ebcFEWodYoYedgYmoRLKrLB55SUTeWov3 O7bSnm+iK3b/SH4hIuuLB5LInK0p3wbo4fa+4KELn3eMJI7YZ1rTsqLwgYIMBMYZw6EztF v+96J+vgw+Mh2cX9ynF5TXl3uTK1Ad9pGwZ197um2BjpUzUpN1Wz0lmjRWpnwGrTKo2bBH dmtW6SXJ6ipHEYb7cI9pAO+JWfYzavrTJ0vpwKT1qBH3VGu/m0yK+HzkrHpO1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpyWc3F04z10Ys; Sun, 2 Apr 2023 02:23:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3322NuPV084270; Sun, 2 Apr 2023 02:23:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3322NuOL084269; Sun, 2 Apr 2023 02:23:56 GMT (envelope-from git) Date: Sun, 2 Apr 2023 02:23:56 GMT Message-Id: <202304020223.3322NuOL084269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: e0d79c960902 - main - devel/llvm16: style fixes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0d79c960902c03bfeda04433fb677bbd86e990b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0d79c960902c03bfeda04433fb677bbd86e990b commit e0d79c960902c03bfeda04433fb677bbd86e990b Author: Brooks Davis AuthorDate: 2023-04-02 02:17:49 +0000 Commit: Brooks Davis CommitDate: 2023-04-02 02:17:49 +0000 devel/llvm16: style fixes Fix assorted minor issues spotted when cleaning update llvm/devel. No functional changes. --- devel/llvm16/Makefile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 86b18d6e5c22..9e0fa8b1343b 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -38,8 +38,7 @@ LLVM_PREFIX= ${PREFIX}/${LLVM_DIR} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -USES= cmake compiler:c++17-lang cpe tar:xz \ - shebangfix +USES= cmake compiler:c++17-lang cpe tar:xz shebangfix _USES_PYTHON?= python:3.6+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib @@ -70,7 +69,8 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_SOURCE_PATH= ${WRKSRC}/llvm -CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON +CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON +CMAKE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON CMAKE_ARGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} @@ -165,7 +165,7 @@ DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} EXTRAS_DESC= Extra clang tools EXTRAS_IMPLIES= CLANG -EXTRAS_PLIST_DIRS+= ${LLVM_DIR}/include/clang-tidy/plugin +EXTRAS_PLIST_DIRS= ${LLVM_DIR}/include/clang-tidy/plugin FLANG_DESC= Flang FORTRAN compiler FLANG_IMPLIES= MLIR FLANG_PORTDOCS= flang @@ -207,9 +207,9 @@ CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif -PLIST_SUB+= LLVM_RELEASE=${LLVM_RELEASE} \ - LLVM_SUFFIX=${LLVM_SUFFIX} \ - LLVM_MAJOR=${LLVM_MAJOR} +PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} \ + LLVM_RELEASE=${LLVM_RELEASE} \ + LLVM_SUFFIX=${LLVM_SUFFIX} COMMANDS= ${LLVM_COMMANDS} FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} @@ -221,7 +221,8 @@ STRIP_LIBS= BugpointPasses.so \ ${LIBNAME}.0 \ libLTO.so -EXTRAS_LIBS= libclangApplyReplacements \ +EXTRAS_LIBS= \ + libclangApplyReplacements \ libclangChangeNamespace \ libclangDaemon \ libclangDoc \ @@ -479,10 +480,9 @@ post-patch-CLANG-on: post-patch-LLD-on: ${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \ - ${WRKSRC}/lld/docs/conf.py + ${WRKSRC}/lld/docs/conf.py post-install: - ${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} @@ -522,7 +522,7 @@ post-install-DOCS-off: post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ - ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp + ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ @@ -531,6 +531,7 @@ post-install-CLANG-on: post-install-EXTRAS-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/clang-tidy/misc/ConfusableTable + post-install-FLANG-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CodeGen/CMakeFiles ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Dialect/CMakeFiles @@ -554,9 +555,9 @@ post-install-LIT-on: ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/builtin_commands/*.py \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands/ ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/formats/*.py \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats/ ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \