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 61945158094 for ; Sat, 23 Jul 2022 11:22:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB030E0DD1; Sat, 23 Jul 2022 11:22:36 +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 99BBDE0DC4 for ; Sat, 23 Jul 2022 11:22:36 +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 B41F03410B9 for ; Sat, 23 Jul 2022 11:22:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF1B954D for ; Sat, 23 Jul 2022 11:22:32 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1658575261.f80f3b27a81313f051b2ba0961a110aa14abb76d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch dev-qt/qtcore/qtcore-5.15.5-r2.ebuild X-VCS-Directories: dev-qt/qtcore/ dev-qt/qtcore/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f80f3b27a81313f051b2ba0961a110aa14abb76d X-VCS-Branch: master Date: Sat, 23 Jul 2022 11:22:32 +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: 6e84b462-be17-4ff3-9a1d-2a63359ba9a5 X-Archives-Hash: 61d4ed894baa482950bd804c89bb68de commit: f80f3b27a81313f051b2ba0961a110aa14abb76d Author: Alfred Persson Forsberg catcream org> AuthorDate: Tue Jun 21 00:42:04 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 23 11:21:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80f3b27 dev-qt/qtcore: fix musl with libexecinfo QtCore incorrectly assumes that execinfo is already linked on Linux if execinfo.h is present. The edge case here is that on musl you can install libexecinfo standalone, thereby QtCore will detect the header but not the library, and QtCore will think that glibc has already linked it. There is no code/config for QMake to detect and link against -lexecinfo except on the BSD:s. Qt should properly add something similar for non-glibc as well. This is just a *fix* compatible with all supported Gentoo systems. Signed-off-by: Alfred Persson Forsberg catcream.org> Closes: https://github.com/gentoo/gentoo/pull/26012 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qtcore-5.15.5-hack_never_use_execinfo.patch | 27 ++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 2 ++ 2 files changed, 29 insertions(+) diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch b/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch new file mode 100644 index 000000000000..c74de19c6144 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch @@ -0,0 +1,27 @@ +QtCore only links with -lexecinfo on *bsd and +incorrectly assumes it's already linked on Linux +if execinfo.h exists. + +This is a fix specificallly for non-glibc systems, was written for musl. +We'll look to add a build system option for libexecinfo in future. + +--- + src/corelib/global/qlogging.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp +index 89f49324..1c34a1af 100644 +--- a/src/corelib/global/qlogging.cpp ++++ b/src/corelib/global/qlogging.cpp +@@ -106,7 +106,7 @@ + # if __UCLIBC_HAS_BACKTRACE__ + # define QLOGGING_HAVE_BACKTRACE + # endif +-# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include() && __has_include()) ++# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) + # define QLOGGING_HAVE_BACKTRACE + # endif + #endif +-- +2.35.1 + diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild index 22d03f26bc3a..2b2d3b2fe2b5 100644 --- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild @@ -27,6 +27,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-hack_never_use_execinfo.patch" ) + QT5_TARGET_SUBDIRS=( src/tools/bootstrap src/tools/moc