From: "Ludovic Courtès" <ludo@gnu.org>
To: Rutherther <rutherther@ditigal.xyz>
Cc: Andreas Enge <andreas@enge.fr>, 73793@debbugs.gnu.org
Subject: [bug#73793] [PATCH] gnu: gcc-9: Fix name conflict for newer glibc versions
Date: Mon, 14 Oct 2024 13:52:48 +0200 [thread overview]
Message-ID: <87a5f63nqn.fsf@gnu.org> (raw)
In-Reply-To: <f18d0454c198003e64c962d3e3b4de5ab9c930b4.1728832424.git.rutherther@ditigal.xyz> (rutherther@ditigal.xyz's message of "Sun, 13 Oct 2024 17:22:36 +0200")
Rutherther <rutherther@ditigal.xyz> skribis:
> Note: not tested yet, I am currently building it locally.
>
> Since newer glibc version there is a conflict in names.
> This uses a patch that was used upstream in llvm to bypass it.
>
> * gnu/packages/patches/gcc-9-glibc-name-conflict.patch: Add gcc 9 glibc patch.
> * gnu/local.mk: Register it.
> * gnu/packages/gcc.scm (gcc-9)[source]: Use it.
>
> Change-Id: Ibb8446b7bba52f72d82fcf69804cae09215daeed
[...]
> +++ b/gnu/packages/patches/gcc-9-glibc-name-conflict.patch
> @@ -0,0 +1,54 @@
> +From b379129c4beb3f26223288627a1291739f33af02 Mon Sep 17 00:00:00 2001
> +From: Fangrui Song <i@maskray.me>
> +Date: Mon, 11 Jul 2022 11:38:28 -0700
> +Subject: [PATCH] [sanitizer] Remove #include <linux/fs.h> to resolve
> + fsconfig_command/mount_attr conflict with glibc 2.36
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +It is generally not a good idea to mix usage of glibc headers and Linux UAPI
> +headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc
> +since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h
> +defines `fsconfig_command` which conflicts with linux/mount.h:
> +
> + .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’
Instead of this new patch, could you check whether
‘gcc-7-libsanitizer-fsconfig-command.patch’ applies?
If not, could you make sure the new patch has a name similar to the
other ones in this area and a similar header?
Thanks in advance,
Ludo’.
next prev parent reply other threads:[~2024-10-14 12:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-13 15:22 [bug#73793] [PATCH] gnu: gcc-9: Fix name conflict for newer glibc versions Rutherther via Guix-patches via
2024-10-13 17:10 ` [bug#73793] [PATCH v2 0/1] Fixes of the patch for gcc 9 Rutherther via Guix-patches via
2024-10-13 17:10 ` [bug#73793] [PATCH v2] gnu: gcc-9: Fix name conflict for newer glibc versions Rutherther via Guix-patches via
2024-10-14 11:52 ` Ludovic Courtès [this message]
2024-10-14 18:00 ` [bug#73793] [PATCH v3] gnu: gcc-9: Add libsanitizer fsconfig command patch Rutherther via Guix-patches via
2024-10-15 15:45 ` bug#73793: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a5f63nqn.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=73793@debbugs.gnu.org \
--cc=andreas@enge.fr \
--cc=rutherther@ditigal.xyz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).