From owner-svn-ports-head@freebsd.org Mon Feb 25 19:28:57 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84F6F1513E96; Mon, 25 Feb 2019 19:28:57 +0000 (UTC) (envelope-from brooks@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F26B7763FA; Mon, 25 Feb 2019 19:28:56 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9210C2177E; Mon, 25 Feb 2019 19:28:56 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1PJSuYc051875; Mon, 25 Feb 2019 19:28:56 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1PJSter051870; Mon, 25 Feb 2019 19:28:55 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201902251928.x1PJSter051870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 25 Feb 2019 19:28:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493890 - in head/devel: llvm70 llvm80 llvm80/files X-SVN-Group: ports-head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/devel: llvm70 llvm80 llvm80/files X-SVN-Commit-Revision: 493890 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F26B7763FA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2019 19:28:57 -0000 Author: brooks Date: Mon Feb 25 19:28:55 2019 New Revision: 493890 URL: https://svnweb.freebsd.org/changeset/ports/493890 Log: Fix libclangDoc.a installation, install clang-doc80 Bug 230791 mistakenly put libclangDoc.a under %%DOCS%%. It actually belongs to clang extras. Plus, on 8.0.0, the clang-doc binary does work, so we can install that too. PORTREVISION bumped for llvm80 due to new file, not bumped for llvm70 as this plist change only fixes previously broken OPTIONS configurations. PR: 230791 Submitted by: Greg V Differential Revision: https://reviews.freebsd.org/D19068 Added: head/devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt (contents, props changed) Modified: head/devel/llvm70/Makefile head/devel/llvm70/pkg-plist head/devel/llvm80/Makefile head/devel/llvm80/pkg-plist Modified: head/devel/llvm70/Makefile ============================================================================== --- head/devel/llvm70/Makefile Mon Feb 25 18:53:06 2019 (r493889) +++ head/devel/llvm70/Makefile Mon Feb 25 19:28:55 2019 (r493890) @@ -180,6 +180,7 @@ EXTRAS_COMMANDS+= \ EXTRAS_LIBS= libclangApplyReplacements \ libclangChangeNamespace \ libclangDaemon \ + libclangDoc \ libclangIncludeFixer \ libclangMove \ libclangQuery \ @@ -529,7 +530,6 @@ build-plist: if ($$0 ~ /${COMPILER_RT_PATTERN}/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ - if ($$0 ~ /(libclangDoc.a)/) {printf "%%%%DOCS%%%%"} \ if ($$0 ~ /(lld|wasm-ld)/ && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \ Modified: head/devel/llvm70/pkg-plist ============================================================================== --- head/devel/llvm70/pkg-plist Mon Feb 25 18:53:06 2019 (r493889) +++ head/devel/llvm70/pkg-plist Mon Feb 25 19:28:55 2019 (r493890) @@ -2798,7 +2798,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%% %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDaemon.a -%%CLANG%%%%DOCS%%llvm%%LLVM_SUFFIX%%/lib/libclangDoc.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDoc.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a Modified: head/devel/llvm80/Makefile ============================================================================== --- head/devel/llvm80/Makefile Mon Feb 25 18:53:06 2019 (r493889) +++ head/devel/llvm80/Makefile Mon Feb 25 19:28:55 2019 (r493890) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 8.0.0rc2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -190,6 +190,7 @@ STRIP_LIBS= BugpointPasses.so \ EXTRAS_COMMANDS+= \ clang-apply-replacements \ clang-change-namespace \ + clang-doc \ clang-include-fixer \ clang-modernize \ clang-query \ @@ -202,6 +203,7 @@ EXTRAS_COMMANDS+= \ EXTRAS_LIBS= libclangApplyReplacements \ libclangChangeNamespace \ libclangDaemon \ + libclangDoc \ libclangIncludeFixer \ libclangMove \ libclangQuery \ @@ -611,7 +613,6 @@ build-plist: if ($$0 ~ /${COMPILER_RT_PATTERN}/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ - if ($$0 ~ /(libclangDoc.a)/) {printf "%%%%DOCS%%%%"} \ if ($$0 ~ /(lld|wasm-ld)/ && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \ Added: head/devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt Mon Feb 25 19:28:55 2019 (r493890) @@ -0,0 +1,7 @@ +--- tools/clang/tools/extra/clang-doc/tool/CMakeLists.txt.orig 2019-02-02 19:08:19 UTC ++++ tools/clang/tools/extra/clang-doc/tool/CMakeLists.txt +@@ -15,3 +15,4 @@ target_link_libraries(clang-doc + clangToolingCore + ) + ++install(TARGETS clang-doc RUNTIME DESTINATION bin) Modified: head/devel/llvm80/pkg-plist ============================================================================== --- head/devel/llvm80/pkg-plist Mon Feb 25 18:53:06 2019 (r493889) +++ head/devel/llvm80/pkg-plist Mon Feb 25 19:28:55 2019 (r493890) @@ -70,6 +70,7 @@ bin/hmaptool%%LLVM_SUFFIX%% %%LLDB%%bin/lldb-vscode%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-apply-replacements%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-change-namespace%%LLVM_SUFFIX%% +%%EXTRAS%%bin/clang-doc%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-include-fixer%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-modernize%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-query%%LLVM_SUFFIX%% @@ -117,6 +118,7 @@ llvm%%LLVM_SUFFIX%%/bin/bugpoint %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-check %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-cl %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-cpp +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-doc %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-extdef-mapping %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-format %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-import-test @@ -2849,7 +2851,7 @@ llvm%%LLVM_SUFFIX%%/lib/libOptRemarks.so.%%LLVM_MAJOR% %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDaemon.a -%%CLANG%%%%DOCS%%llvm%%LLVM_SUFFIX%%/lib/libclangDoc.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDoc.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a