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 64AFF15806E for ; Mon, 5 Jun 2023 08:05:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A56BE0895; Mon, 5 Jun 2023 08:05:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 EF5B2E0895 for ; Mon, 5 Jun 2023 08:05:15 +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 DCB72335D27 for ; Mon, 5 Jun 2023 08:05:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39C7FA5A for ; Mon, 5 Jun 2023 08:05:13 +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: <1685952300.b7c183e7838679143dbbd775be6d771e2fff21e6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/hyprland/hyprland-0.26.0.ebuild X-VCS-Directories: gui-wm/hyprland/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b7c183e7838679143dbbd775be6d771e2fff21e6 X-VCS-Branch: master Date: Mon, 5 Jun 2023 08:05:13 +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: 2bf21675-5a8f-4354-8ee8-f4692e27c4e2 X-Archives-Hash: 491a12fe7572440ce2668852e928e6b8 commit: b7c183e7838679143dbbd775be6d771e2fff21e6 Author: Sam James gentoo org> AuthorDate: Mon Jun 5 08:04:31 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 5 08:05:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c183e7 gui-wm/hyprland: fix Clang check Closes: https://bugs.gentoo.org/907871 Fixes: 61c03dd0e0d108c62376e97cf587ddbb8d43cda2 Signed-off-by: Sam James gentoo.org> gui-wm/hyprland/hyprland-0.26.0.ebuild | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gui-wm/hyprland/hyprland-0.26.0.ebuild b/gui-wm/hyprland/hyprland-0.26.0.ebuild index 71f645881c68..a8cb65a2382c 100644 --- a/gui-wm/hyprland/hyprland-0.26.0.ebuild +++ b/gui-wm/hyprland/hyprland-0.26.0.ebuild @@ -56,24 +56,29 @@ BDEPEND=" >=gui-libs/wlroots-0.16.0[X?] " -src_prepare() { - if [[ $(tc-is-gcc) ]]; then +pkg_setup() { + [[ ${MERGE_TYPE} == binary ]] && return + + if tc-is-gcc; then STDLIBVER=$(echo '#include ' | $(tc-getCXX) -x c++ -dM -E - | \ grep GLIBCXX_RELEASE | sed 's/.*\([1-9][0-9]\)/\1/') + if ! [[ ${STDLIBVER} -ge 12 ]]; then die "Hyprland requires >=sys-devel/gcc-12.1.0 to build" fi - elif [[ $(clang-major-version) -lt 16 ]]; then - die "Hyprland requires >=sys-devel/clang-16.0.3 to build"; - fi + elif [[ $(clang-major-version) -lt 16 ]]; then + die "Hyprland requires >=sys-devel/clang-16.0.3 to build"; + fi +} +src_prepare() { if use video_cards_nvidia; then cd "${S}/subprojects/wlroots" || die eapply "${FILESDIR}/nvidia-0.25.0.patch" cd "${S}" || die fi - eapply_user + default } src_configure() {