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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0C81B15864F for ; Sun, 26 Mar 2023 22:57:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 133F9E0894; Sun, 26 Mar 2023 22:57:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 DA4B0E0894 for ; Sun, 26 Mar 2023 22:57:07 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEAA23411EC for ; Sun, 26 Mar 2023 22:57:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C6758E4 for ; Sun, 26 Mar 2023 22:57:05 +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: <1679871412.51211f99f14f80bc92049cbbf1717a39c50887b2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild dev-util/kdevelop/kdevelop-22.12.3.ebuild X-VCS-Directories: dev-util/kdevelop/files/ dev-util/kdevelop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 51211f99f14f80bc92049cbbf1717a39c50887b2 X-VCS-Branch: master Date: Sun, 26 Mar 2023 22:57:05 +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: c5717753-dece-418b-916e-3ccfaec55ac8 X-Archives-Hash: ea917da2c3ed185ceb99e45d522d97b2 commit: 51211f99f14f80bc92049cbbf1717a39c50887b2 Author: Sam James gentoo org> AuthorDate: Sun Mar 26 22:55:54 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 26 22:56:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51211f99 dev-util/kdevelop: fix build with Clang 16, use llvm.eclass Closes: https://bugs.gentoo.org/902101 Thanks-to: Michael Uleysky gmail.com> Signed-off-by: Sam James gentoo.org> .../kdevelop/files/kdevelop-22.12.3-clang16.patch | 24 ++++++++++++++++++++++ ...p-22.12.3.ebuild => kdevelop-22.12.3-r1.ebuild} | 18 ++++++++++------ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch new file mode 100644 index 000000000000..38676cc16473 --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/902101 +--- a/cmake/modules/FindClang.cmake ++++ b/cmake/modules/FindClang.cmake +@@ -97,6 +97,8 @@ + # dito for git + string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}") + ++ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}") ++ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}") + find_path(CLANG_BUILTIN_DIR + # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator + NAMES "cpuid.h" +@@ -106,6 +108,10 @@ + "../../../clang/${CLANG_VERSION}/include" + "clang/${CLANG_VERSION_CLEAN}/include" + "../../../clang/${CLANG_VERSION_CLEAN}/include" ++ "clang/${CLANG_VERSION_STRIPPED}/include" ++ "../../../clang/${CLANG_VERSION_STRIPPED}/include" ++ "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include" ++ "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include" + NO_DEFAULT_PATH + ) + + diff --git a/dev-util/kdevelop/kdevelop-22.12.3.ebuild b/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild similarity index 93% rename from dev-util/kdevelop/kdevelop-22.12.3.ebuild rename to dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild index cb912cc23d10..6788033f46fe 100644 --- a/dev-util/kdevelop/kdevelop-22.12.3.ebuild +++ b/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild @@ -7,10 +7,11 @@ ECM_HANDBOOK="forceoptional" ECM_TEST="true" KDE_ORG_CATEGORY="kdevelop" KFMIN=5.101.0 +LLVM_MAX_SLOT=16 QTMIN=5.15.5 VIRTUALDBUS_TEST="true" VIRTUALX_REQUIRED="test" -inherit ecm gear.kde.org optfeature +inherit ecm gear.kde.org llvm optfeature DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" HOMEPAGE="https://www.kdevelop.org/" @@ -65,7 +66,7 @@ COMMON_DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 >=kde-frameworks/threadweaver-${KFMIN}:5 - >=sys-devel/clang-6.0:= +