From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 43555158020 for ; Sat, 5 Nov 2022 06:35:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B5FBE085A; Sat, 5 Nov 2022 06:35:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 162A3E085A for ; Sat, 5 Nov 2022 06:35:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C033340815 for ; Sat, 5 Nov 2022 06:35:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D1536FE for ; Sat, 5 Nov 2022 06:35:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1667629963.e41b0b28956d54254c714b6dc6b0fd3983c614c7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qt-creator/qt-creator-8.0.1.ebuild X-VCS-Directories: dev-qt/qt-creator/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e41b0b28956d54254c714b6dc6b0fd3983c614c7 X-VCS-Branch: master Date: Sat, 5 Nov 2022 06:35:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6295579d-5846-4d30-a50a-8ed4e50e202f X-Archives-Hash: d6ed3f9d8c24bdfff08ef1e81f677917 commit: e41b0b28956d54254c714b6dc6b0fd3983c614c7 Author: Peter Levine gmail com> AuthorDate: Tue Nov 1 23:36:12 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 5 06:32:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41b0b28 dev-qt/qt-creator: fix unnecessary dependence on dev-cpp/yaml-cpp Including the clangtools plugin's CMakeLists.txt causes an unconditional dependence on dev-cpp/yaml-cpp, whether or not the plugin is enabled. Removing 'add_subdirectory(clangtools)' from the parent directory's CMakeLists.txt when the clangtools USE flag is disabled resolves it. Bug: https://bugs.gentoo.org/878753 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Sam James gentoo.org> dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild index e110647e5230..138e0e37a74e 100644 --- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild @@ -180,6 +180,8 @@ src_prepare() { src/libs/CMakeLists.txt cmake_use_remove_addsubdirectory qml advanceddockingsystem \ src/libs/CMakeLists.txt + cmake_use_remove_addsubdirectory clang clangtools \ + src/plugins/CMakeLists.txt cmake_use_remove_addsubdirectory test test \ src/plugins/mcusupport/CMakeLists.txt @@ -338,7 +340,6 @@ src_configure() { # Clang stuff -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) - -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) # QML stuff # -DBUILD_PLUGIN_QMLDESIGNER=$(usex qml) #Qt6 only @@ -362,6 +363,7 @@ src_configure() { -DClang_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/clang" -DLLVM_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/llvm" -DCLANGTOOLING_LINK_CLANG_DYLIB=YES + -DBUILD_PLUGIN_CLANGTOOLS=YES ) fi if use help; then