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 94B9A158089 for ; Fri, 6 Oct 2023 07:43:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEE462BC0A9; Fri, 6 Oct 2023 07:43:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98C9F2BC0A9 for ; Fri, 6 Oct 2023 07:43:29 +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 C80E1335CE9 for ; Fri, 6 Oct 2023 07:43:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 318549CD for ; Fri, 6 Oct 2023 07:43:27 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1696578196.2a8261f17c36e7abbe38717a8f4b8a9b2c5e8868.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild X-VCS-Directories: dev-python/shiboken2/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 2a8261f17c36e7abbe38717a8f4b8a9b2c5e8868 X-VCS-Branch: master Date: Fri, 6 Oct 2023 07:43:27 +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: bc67afdc-e4ac-4554-9210-5588b116a835 X-Archives-Hash: c34f89e358ae46f690fe4e6ab5eadf42 commit: 2a8261f17c36e7abbe38717a8f4b8a9b2c5e8868 Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri Oct 6 07:34:05 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Oct 6 07:43:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8261f1 dev-python/shiboken2: adjust clang header finding logic for clang>=16 Pyside2 currently fails with clang-16, so we have to keep the current LLVM_MAX_SLOT. However we can adjust the logic here to keep it in sync with shiboken6 and prepare it for a possible next release that may be compatible with clang-16. Co-authored-by: Alfred Wingate protonmail.com> Signed-off-by: Andrew Ammerlaan gentoo.org> .../{shiboken2-5.15.10-r1.ebuild => shiboken2-5.15.10-r2.ebuild} | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild similarity index 96% rename from dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild rename to dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild index b47b73c5ae04..f83d6000ad45 100644 --- a/dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild +++ b/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild @@ -86,6 +86,13 @@ src_prepare() { ApiExtractor/clangparser/compilersupport.cpp || die fi + local clangver="$(CPP=clang clang-major-version)" + + # Clang 15 and older used the full version as a directory name. + if [[ ${clangver} -lt 16 ]]; then + clangver="$(CPP=clang clang-fullversion)" + fi + # Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is @@ -101,7 +108,7 @@ src_prepare() { # PySide2 does *NOT* care whether the end user has done so or not, as # PySide2 unconditionally requires Clang in either case. See also: # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ + sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${clangver}"'/include"))~' \ ApiExtractor/clangparser/compilersupport.cpp || die cmake_src_prepare