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 37DC3158010 for ; Fri, 17 Feb 2023 01:43:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79BF2E0869; Fri, 17 Feb 2023 01:43:57 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FB62E0869 for ; Fri, 17 Feb 2023 01:43:57 +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 6D98F34114B for ; Fri, 17 Feb 2023 01:43:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB2FB8A3 for ; Fri, 17 Feb 2023 01:43:54 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1676598218.9cd0dbf67043d2630f3582c7609b184be7bb2a8e.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/, dev-games/godot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/godot/files/godot-4.0_rc2-musl.patch dev-games/godot/godot-4.0_rc2.ebuild X-VCS-Directories: dev-games/godot/ dev-games/godot/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 9cd0dbf67043d2630f3582c7609b184be7bb2a8e X-VCS-Branch: master Date: Fri, 17 Feb 2023 01:43:54 +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: 658e02fc-9e6a-4b75-b628-58e34aed3a3c X-Archives-Hash: 75f8c85201fdb838fa553fa5f568a139 commit: 9cd0dbf67043d2630f3582c7609b184be7bb2a8e Author: Ionen Wolkens gentoo org> AuthorDate: Fri Feb 17 00:45:50 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Feb 17 01:43:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd0dbf6 dev-games/godot: update musl patch Used to work but missed that a new godot4 alpha added automagic to enable execinfo. If libexecinfo is ever packaged, could yank this, depend on it for musl and let the automagic do its thing. Not really tested on musl, but it builds. godot:3 should still build fine, it only auto-enables execinfo on BSD. Closes: https://bugs.gentoo.org/894762 Signed-off-by: Ionen Wolkens gentoo.org> dev-games/godot/files/godot-4.0_rc2-musl.patch | 21 +++++++++++++++++++++ dev-games/godot/godot-4.0_rc2.ebuild | 3 +-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dev-games/godot/files/godot-4.0_rc2-musl.patch b/dev-games/godot/files/godot-4.0_rc2-musl.patch new file mode 100644 index 000000000000..3b9a458ac7d4 --- /dev/null +++ b/dev-games/godot/files/godot-4.0_rc2-musl.patch @@ -0,0 +1,21 @@ +Crash handler requires glibc or libexecinfo (not packaged) and is enabled +if build the editor (implies debug), but can be easily turned off. +https://bugs.gentoo.org/894762 +--- a/platform/linuxbsd/crash_handler_linuxbsd.cpp ++++ b/platform/linuxbsd/crash_handler_linuxbsd.cpp +@@ -38,3 +38,3 @@ + +-#ifdef DEBUG_ENABLED ++#if defined(DEBUG_ENABLED) && defined(__GLIBC__) + #define CRASH_HANDLER_ENABLED 1 +--- a/platform/linuxbsd/detect.py ++++ b/platform/linuxbsd/detect.py +@@ -329,8 +329,2 @@ + +- if not env["execinfo"] and platform.libc_ver()[0] != "glibc": +- # The default crash handler depends on glibc, so if the host uses +- # a different libc (BSD libc, musl), fall back to libexecinfo. +- print("Note: Using `execinfo=yes` for the crash handler as required on platforms where glibc is missing.") +- env["execinfo"] = True +- + if env["execinfo"]: diff --git a/dev-games/godot/godot-4.0_rc2.ebuild b/dev-games/godot/godot-4.0_rc2.ebuild index 8c124e770a8e..d031d3f1fcaf 100644 --- a/dev-games/godot/godot-4.0_rc2.ebuild +++ b/dev-games/godot/godot-4.0_rc2.ebuild @@ -62,9 +62,9 @@ DEPEND=" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-4.0-musl.patch "${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch "${FILESDIR}"/${PN}-4.0_beta8-scons.patch + "${FILESDIR}"/${PN}-4.0_rc2-musl.patch ) src_prepare() { @@ -109,7 +109,6 @@ src_compile() { verbose=yes deprecated=$(usex deprecated) - #execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged opengl3=$(usex gui) use_volk=no # unnecessary when linking directly to libvulkan vulkan=$(usex gui $(usex vulkan))