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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E57AC15812D for ; Sun, 29 Dec 2024 13:33:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E8A7E07A7; Sun, 29 Dec 2024 13:33:08 +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 389C5E07A7 for ; Sun, 29 Dec 2024 13:33:08 +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 7258233BED4 for ; Sun, 29 Dec 2024 13:33:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E15711AC for ; Sun, 29 Dec 2024 13:33:05 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1735479135.a0ff1230984dd1d740c823eead6a091777d3d0fa.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/, sys-devel/gcc/files/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: sys-devel/gcc/files/gcc-14.2.0-libintl-setlocale.patch sys-devel/gcc/gcc-14.2.1_p20241221.ebuild X-VCS-Directories: sys-devel/gcc/files/ sys-devel/gcc/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: a0ff1230984dd1d740c823eead6a091777d3d0fa X-VCS-Branch: master Date: Sun, 29 Dec 2024 13:33: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: 372e781d-41aa-4878-a4ee-5eabceb14079 X-Archives-Hash: 70ec94bbb64ebdd9dbb311ef3e2b068d commit: a0ff1230984dd1d740c823eead6a091777d3d0fa Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 29 13:32:15 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 29 13:32:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a0ff1230 sys-devel/gcc-14.2.1_p20241221: fix compilation with libintl-0.23 Closes: https://bugs.gentoo.org/946500 Signed-off-by: Fabian Groffen gentoo.org> .../gcc/files/gcc-14.2.0-libintl-setlocale.patch | 25 ++++++++++++++++++++++ sys-devel/gcc/gcc-14.2.1_p20241221.ebuild | 3 +++ 2 files changed, 28 insertions(+) diff --git a/sys-devel/gcc/files/gcc-14.2.0-libintl-setlocale.patch b/sys-devel/gcc/files/gcc-14.2.0-libintl-setlocale.patch new file mode 100644 index 0000000000..2962b677af --- /dev/null +++ b/sys-devel/gcc/files/gcc-14.2.0-libintl-setlocale.patch @@ -0,0 +1,25 @@ +libcpp/system.h: remove setlocale override + +This is non-upstreamable as is, it seems the configure check for +HAVE_SETLOCALE is missing, but since it comes from libintl.h not sure +how trivial this is (needs gettext macros). + +In Prefix setlocale is always present, either via the libc, or libintl. +So we don't need to dummy it. Doing so results in problems with +libintl-0.23, which is included right after dummifying. + +Bug: https://bugs.gentoo.org/946500 + +--- a/libcpp/system.h ++++ b/libcpp/system.h +@@ -271,10 +271,6 @@ + # include + #endif + +-#ifndef HAVE_SETLOCALE +-# define setlocale(category, locale) (locale) +-#endif +- + #ifdef ENABLE_NLS + #include + #else diff --git a/sys-devel/gcc/gcc-14.2.1_p20241221.ebuild b/sys-devel/gcc/gcc-14.2.1_p20241221.ebuild index e99242970c..a070196cdd 100644 --- a/sys-devel/gcc/gcc-14.2.1_p20241221.ebuild +++ b/sys-devel/gcc/gcc-14.2.1_p20241221.ebuild @@ -50,6 +50,9 @@ src_prepare() { # run as with - on pipe (for Clang 16) eapply "${FILESDIR}"/${PN}-14.2.0-darwin-as-dash-pipe.patch + # fix build with libintl-0.23 + eapply "${FILESDIR}"/${PN}-14.2.0-libintl-setlocale.patch + # make sure 64-bits native targets don't screw up the linker paths eapply "${FILESDIR}"/gcc-12-no-libs-for-startfile.patch