From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 13 11:23:24 2024 Received: (at submit) by debbugs.gnu.org; 13 Oct 2024 15:23:24 +0000 Received: from localhost ([127.0.0.1]:52090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t00RI-0000Yd-8f for submit@debbugs.gnu.org; Sun, 13 Oct 2024 11:23:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:41356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t00RF-0000YU-AL for submit@debbugs.gnu.org; Sun, 13 Oct 2024 11:23:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t00Qz-0002em-7u for guix-patches@gnu.org; Sun, 13 Oct 2024 11:23:05 -0400 Received: from ditigal.xyz ([2a01:4f8:1c1b:6a1c::] helo=mail.ditigal.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1t00Qw-00086q-UG for guix-patches@gnu.org; Sun, 13 Oct 2024 11:23:05 -0400 Received: by cerebrum (OpenSMTPD) with ESMTPSA id 2e994ee0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 13 Oct 2024 15:22:59 +0000 (UTC) From: Rutherther To: guix-patches@gnu.org Subject: [PATCH] gnu: gcc-9: Fix name conflict for newer glibc versions Date: Sun, 13 Oct 2024 17:22:36 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Debbugs-Cc: =?utf-8?b?QW5kcmVhcyBFbmdlIDxhbmRyZWFzQGVuZ2UuZnI+LCBMdWRvdmljIENvdXJ0w4PCqHMgPGx1ZG9AZ251Lm9yZz4=?= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1728832979; h=from : to : cc : subject : date : message-id : mime-version : content-type : content-transfer-encoding : from; bh=h96IRFxJTtA93BtSxrvkvAMh5gbtvjjNNViDKoMgUYM=; b=OOknpu62hRqzBZQhZNkGIcrOmA3DPiEsjZNehJ4waEtWuuzzfPEgR5iYorhwpFHtgBV4u It3IfhXlpO+uGJh+7lpMEFRf5L7VHNh/aaF292FVGUudRFBP9kgq5q0pz3m1PiznnlAWNMH zcpyViIpMLA3dmuLmxMAWx7FS88qnXc= Received-SPF: pass client-ip=2a01:4f8:1c1b:6a1c::; envelope-from=rutherther@ditigal.xyz; helo=mail.ditigal.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Rutherther X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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 --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 3 +- .../patches/gcc-9-glibc-name-conflict.patch | 54 +++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcc-9-glibc-name-conflict.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3a35bbca37..c1e878587a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1349,6 +1349,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-8-sort-libtool-find-output.patch \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ + %D%/packages/patches/gcc-9-glibc-name-conflict.patch \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \ %D%/packages/patches/gcc-12-strmov-store-file-names.patch \ %D%/packages/patches/gcc-10-cross-environment-variables.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index c6c7730ad1..b014cee6c1 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -724,7 +724,8 @@ (define-public gcc-10 (sha256 (base32 "1h87lcfaga0ydsf4pkhwlnjr8mky5ix8npbv6iy3jvzlzm1ra415")) - (patches (search-patches "gcc-9-strmov-store-file-names.patch" + (patches (search-patches "gcc-9-glibc-name-conflict.patch" + "gcc-9-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch" "gcc-10-libsanitizer-no-crypt.patch")) (modules '((guix build utils))) diff --git a/gnu/packages/patches/gcc-9-glibc-name-conflict.patch b/gnu/packages/patches/gcc-9-glibc-name-conflict.patch new file mode 100644 index 0000000000..3796e86c52 --- /dev/null +++ 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 +Date: Mon, 11 Jul 2022 11:38:28 -0700 +Subject: [PATCH] [sanitizer] Remove #include 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’ + +Remove #include which pulls in linux/mount.h. Expand its 4 macros manually. + +Fix https://github.com/llvm/llvm-project/issues/56421 + +Reviewed By: #sanitizers, vitalybuka, zatrazz + +Differential Revision: https://reviews.llvm.org/D129471 +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 4bd425435d56d9..81740bf4ab3948 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -73,7 +73,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -876,10 +875,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; + unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; + #endif +- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; +- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; +- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; +- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; ++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); ++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); ++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); ++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); + unsigned IOCTL_GIO_CMAP = GIO_CMAP; + unsigned IOCTL_GIO_FONT = GIO_FONT; + unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; base-commit: 8f0d76152a4496960f4c2ec219839c5a48b0568e -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 13 13:11:39 2024 Received: (at 73793) by debbugs.gnu.org; 13 Oct 2024 17:11:39 +0000 Received: from localhost ([127.0.0.1]:52259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0282-0006LN-N1 for submit@debbugs.gnu.org; Sun, 13 Oct 2024 13:11:38 -0400 Received: from ditigal.xyz ([78.46.201.50]:38574 helo=mail.ditigal.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t027x-0006Km-Ry for 73793@debbugs.gnu.org; Sun, 13 Oct 2024 13:11:37 -0400 Received: by cerebrum (OpenSMTPD) with ESMTPSA id 08fce82b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 13 Oct 2024 17:11:09 +0000 (UTC) From: Rutherther To: 73793@debbugs.gnu.org Subject: [PATCH v2 0/1] Fixes of the patch for gcc 9 Date: Sun, 13 Oct 2024 19:10:56 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Debbugs-Cc: =?utf-8?b?UnV0aGVydGhlciA8cnV0aGVydGhlckBkaXRpZ2FsLnh5ej4sIEFuZHJlYXMgRW5nZSA8YW5kcmVhc0BlbmdlLmZyPiwgTHVkb3ZpYyBDb3VydMODwqhzIDxsdWRvQGdudS5vcmc+?= Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1728839469; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=eF06Z3XA+RBz6IJv3QwzLGeMCw+qrCaqqTqVCxialik=; b=AQ8+7ssqe/TK3i7rWLeWx6CMNKz+KZ1LTEjyNe4uWP7LSv3r31+rSuNa02te5q5ys5gdt yijgjVSAJMgry9K6brZnaVD7mfsESjiEnrPwzBp+UiiD+sMxKxK8bmHYwPGFC6Byxmgp0pc m/yliO5h1H7O7zE7IK7oTrsMqv2/uxE= X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 73793 Cc: Rutherther X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I forgot to change the name guix has in the source from the one llvm has. Additionally, I also managed to put the patch to gcc-10 instead of gcc-9. So fixed that as well The gcc now builds fine for me on x86_64-linux. Regards, Rutherther Rutherther (1): gnu: gcc-9: Fix name conflict for newer glibc versions gnu/local.mk | 1 + gnu/packages/gcc.scm | 3 +- .../patches/gcc-9-glibc-name-conflict.patch | 54 +++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcc-9-glibc-name-conflict.patch base-commit: 8f0d76152a4496960f4c2ec219839c5a48b0568e -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 13 13:11:43 2024 Received: (at 73793) by debbugs.gnu.org; 13 Oct 2024 17:11:43 +0000 Received: from localhost ([127.0.0.1]:52261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0287-0006Lo-0z for submit@debbugs.gnu.org; Sun, 13 Oct 2024 13:11:43 -0400 Received: from ditigal.xyz ([78.46.201.50]:38574 helo=mail.ditigal.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0281-0006Km-LR for 73793@debbugs.gnu.org; Sun, 13 Oct 2024 13:11:41 -0400 Received: by cerebrum (OpenSMTPD) with ESMTPSA id c414a1c1 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 13 Oct 2024 17:11:10 +0000 (UTC) From: Rutherther To: 73793@debbugs.gnu.org Subject: [PATCH v2] gnu: gcc-9: Fix name conflict for newer glibc versions Date: Sun, 13 Oct 2024 19:10:57 +0200 Message-ID: <436cb9230fbbd3e526f59a41be24fb9704902743.1728837254.git.rutherther@ditigal.xyz> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Debbugs-Cc: =?utf-8?b?UnV0aGVydGhlciA8cnV0aGVydGhlckBkaXRpZ2FsLnh5ej4sIEFuZHJlYXMgRW5nZSA8YW5kcmVhc0BlbmdlLmZyPiwgTHVkb3ZpYyBDb3VydMODwqhzIDxsdWRvQGdudS5vcmc+?= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1728839470; h=from : to : cc : subject : date : message-id : mime-version : content-type : content-transfer-encoding : from; bh=K4RN/WBX2UywuDAB8iBsJUnAsMzW5wm0s0dgO7v9yaU=; b=QTEl0Sy/5En8QhUn0mxw/+k1Z8iki7AG+wmocGykiOGDbPYuOL66eEcHM8oP8fnsm3yrT jzJSZqxQ79gBOMa9TVw9mv8/rIIbOg0YHuROoBDFLik1bri2E+gKVbmYCZeWwYNyAZeeHVe tO2pjYcA2d85K6IEY9Wymp4bV3VK9+A= X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 73793 Cc: Rutherther X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 3 +- .../patches/gcc-9-glibc-name-conflict.patch | 54 +++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcc-9-glibc-name-conflict.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3a35bbca37..c1e878587a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1349,6 +1349,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-8-sort-libtool-find-output.patch \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ + %D%/packages/patches/gcc-9-glibc-name-conflict.patch \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \ %D%/packages/patches/gcc-12-strmov-store-file-names.patch \ %D%/packages/patches/gcc-10-cross-environment-variables.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index c6c7730ad1..f3d4985b75 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -705,7 +705,8 @@ (define-public gcc-9 (sha256 (base32 "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7")) - (patches (search-patches "gcc-13.2.0-libstdc++-docbook-xsl-uri.patch" + (patches (search-patches "gcc-9-glibc-name-conflict.patch" + "gcc-13.2.0-libstdc++-docbook-xsl-uri.patch" "gcc-13.2.0-libstdc++-info-install-fix.patch" "gcc-9-strmov-store-file-names.patch" "gcc-9-asan-fix-limits-include.patch" diff --git a/gnu/packages/patches/gcc-9-glibc-name-conflict.patch b/gnu/packages/patches/gcc-9-glibc-name-conflict.patch new file mode 100644 index 0000000000..0f398ef136 --- /dev/null +++ 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 +Date: Mon, 11 Jul 2022 11:38:28 -0700 +Subject: [PATCH] [sanitizer] Remove #include 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’ + +Remove #include which pulls in linux/mount.h. Expand its 4 macros manually. + +Fix https://github.com/llvm/llvm-project/issues/56421 + +Reviewed By: #sanitizers, vitalybuka, zatrazz + +Differential Revision: https://reviews.llvm.org/D129471 +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 4bd425435d56d9..81740bf4ab3948 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -73,7 +73,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -876,10 +875,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; + unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; + #endif +- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; +- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; +- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; +- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; ++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); ++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); ++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); ++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); + unsigned IOCTL_GIO_CMAP = GIO_CMAP; + unsigned IOCTL_GIO_FONT = GIO_FONT; + unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; base-commit: 8f0d76152a4496960f4c2ec219839c5a48b0568e -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 14 08:40:22 2024 Received: (at 73793) by debbugs.gnu.org; 14 Oct 2024 12:40:22 +0000 Received: from localhost ([127.0.0.1]:37034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0KN3-0008Or-Of for submit@debbugs.gnu.org; Mon, 14 Oct 2024 08:40:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0Jgd-0004th-Hb for 73793@debbugs.gnu.org; Mon, 14 Oct 2024 07:56:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0Jd4-00067E-JP; Mon, 14 Oct 2024 07:52:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=lFzIH7ZoTqGJAOvb2PQJMBUp+6hc73BGcUWjHpJuyAM=; b=jkqT2fsnlo8LYVJC0BR5 YtgC7Ilu7IrVPH/c8lWdvnqWvv642ZvykJQ6KbWFhUAELq2t/V9D5WCyZY6H9nMU0Z9tgc+Rk07z4 gygZYodmdosDbC1h9zTyvWvUbAGIDlW/yMr5eKE9FhnhLrVZTXdzub+fj2k2buKpTC+jr+E5Hr2M8 NJhQbq7HetDv5IztEg6627l1EbQfdGmrCeHdKiwic7v7FtoUHg7vHsUCo2As0ol0zcZqMvF9eoAd2 UGv+v1NcNya/1QT0WBiz5dk7XLXF0s6GhuGSVXSlOPc7znLxSzD+iP4Sop3iT50CXLeHlquS7Eh/L kQQ4TY6AO2rIBA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Rutherther Subject: Re: [bug#73793] [PATCH] gnu: gcc-9: Fix name conflict for newer glibc versions In-Reply-To: (rutherther@ditigal.xyz's message of "Sun, 13 Oct 2024 17:22:36 +0200") References: X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Tridi 23 =?utf-8?Q?Vend=C3=A9miaire?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour du Navet X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 14 Oct 2024 13:52:48 +0200 Message-ID: <87a5f63nqn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 73793 Cc: Andreas Enge , 73793@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Rutherther 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 p= atch. > * 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 > +Date: Mon, 11 Jul 2022 11:38:28 -0700 > +Subject: [PATCH] [sanitizer] Remove #include to resolve > + fsconfig_command/mount_attr conflict with glibc 2.36 > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=3DUTF-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 gl= ibc > +since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mo= unt.h > +defines `fsconfig_command` which conflicts with linux/mount.h: > + > + .../usr/include/linux/mount.h:95:6: error: redeclaration of =E2=80= =98enum fsconfig_command=E2=80=99 Instead of this new patch, could you check whether =E2=80=98gcc-7-libsanitizer-fsconfig-command.patch=E2=80=99 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=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 14 14:01:09 2024 Received: (at 73793) by debbugs.gnu.org; 14 Oct 2024 18:01:09 +0000 Received: from localhost ([127.0.0.1]:44278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0PNV-0005hx-DR for submit@debbugs.gnu.org; Mon, 14 Oct 2024 14:01:09 -0400 Received: from ditigal.xyz ([78.46.201.50]:36940 helo=mail.ditigal.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0PNS-0005gk-Bp for 73793@debbugs.gnu.org; Mon, 14 Oct 2024 14:01:07 -0400 Received: by cerebrum (OpenSMTPD) with ESMTPSA id 3b9b06d4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 14 Oct 2024 18:00:39 +0000 (UTC) From: Rutherther To: 73793@debbugs.gnu.org Subject: [PATCH v3] gnu: gcc-9: Add libsanitizer fsconfig command patch Date: Mon, 14 Oct 2024 20:00:28 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Debbugs-Cc: =?utf-8?b?UnV0aGVydGhlciA8cnV0aGVydGhlckBkaXRpZ2FsLnh5ej4sIEx1ZG92aWMgQ291cnTDg8KocyA8bHVkb0BnbnUub3JnPiwgQW5kcmVhcyBFbmdlIDxhbmRyZWFzQGVuZ2UuZnI+?= Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1728928839; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=wt++R/m0m6PTeMCcFn9OVGCJOS2rbjJXxt7nlJEJg90=; b=ZtgZep9vpXrWVKS5SfCAHE1ScHyaWGS/XZQl3QyOFGXpBm5V7FLhs7OkirDDb8Txq1oBa p0rua06QdZ+kHMFUqUDZGaFN3hxzs3lcmmmP/1bt9z9kgS1I8tgeVBG4eX8ZsdF4ulsVJt0 QgOh3sCQxRJ6zfjgDaiqHbEOl5wXFXk= X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 73793 Cc: ludo@gnu.org, Rutherther X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Since newer glibc version there is a conflict in names between kernel module and glibc module. This uses a patch that was used upstream in llvm to bypass it. Without this, the build fails with a redefinition error. * gnu/packages/gcc.scm: Add gcc-7-libsanitizer-fsconfig-command.patch. Change-Id: Ibb8446b7bba52f72d82fcf69804cae09215daeed --- gnu/packages/gcc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index c6c7730ad1..c9e475b676 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -705,7 +705,8 @@ (define-public gcc-9 (sha256 (base32 "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7")) - (patches (search-patches "gcc-13.2.0-libstdc++-docbook-xsl-uri.patch" + (patches (search-patches "gcc-7-libsanitizer-fsconfig-command.patch" + "gcc-13.2.0-libstdc++-docbook-xsl-uri.patch" "gcc-13.2.0-libstdc++-info-install-fix.patch" "gcc-9-strmov-store-file-names.patch" "gcc-9-asan-fix-limits-include.patch" base-commit: 8f0d76152a4496960f4c2ec219839c5a48b0568e -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 15 11:57:08 2024 Received: (at 73793-done) by debbugs.gnu.org; 15 Oct 2024 15:57:08 +0000 Received: from localhost ([127.0.0.1]:56573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0jv2-0002qM-7c for submit@debbugs.gnu.org; Tue, 15 Oct 2024 11:57:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0jv0-0002ph-7W for 73793-done@debbugs.gnu.org; Tue, 15 Oct 2024 11:57:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0jk8-0000n4-1T; Tue, 15 Oct 2024 11:45:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Qzm+m/vA1ZQyvxcgnIZt3zfuyVgGn5H0pPJrIeiYWpA=; b=rVn+IjUv8V27E6sQU4ed dIn2GUsPw8Kd4Ldl6a1jtUFrUPMHcW0rvJPf93YWEYbH5i4GrYPBgBY5Ws54QA0JSGUe3nYA2KzQZ R30D7EfvDgjuDkktx89LGhYJIbSo0jb9XxNhOMP2odekxl6fLxYWHzQ5Xw3FZT3/4B/SMX25q6vQ8 oQaezBkdpNPocyjc2KNa+gpDTWW7C5vgL3lhxWDRN16Zto1rPWQMlD8fdBp36K7XfBebqxHF+annF RKzWVq5ytApqNeww5jqXF+CvsheXGjiam/YXoZ5+nWL6In9xv+56kMSqJgEeC4Ecxv6/5/MSKTIJw hUGU1lds1nEYTQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Rutherther Subject: Re: [PATCH v3] gnu: gcc-9: Add libsanitizer fsconfig command patch In-Reply-To: (rutherther@ditigal.xyz's message of "Mon, 14 Oct 2024 20:00:28 +0200") References: X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quartidi 24 =?utf-8?Q?Vend=C3=A9miaire?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour de l'Amaryllis X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 15 Oct 2024 17:45:46 +0200 Message-ID: <87sesxwes5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 73793-done Cc: 73793-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Rutherther skribis: > Since newer glibc version there is a conflict in names > between kernel module and glibc module. > This uses a patch that was used upstream in llvm to bypass it. > Without this, the build fails with a redefinition error. > > * gnu/packages/gcc.scm: Add gcc-7-libsanitizer-fsconfig-command.patch. > > Change-Id: Ibb8446b7bba52f72d82fcf69804cae09215daeed I tweaked the commit log to clarify which entities are changed. Applied, thanks! Ludo=E2=80=99. From unknown Tue Jun 17 22:29:09 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 13 Nov 2024 12:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator