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 21029158094 for ; Wed, 3 Aug 2022 02:25:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA635E0CAB; Wed, 3 Aug 2022 02:25:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 956E8E0CAB for ; Wed, 3 Aug 2022 02:25:15 +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 92A6833BEF2 for ; Wed, 3 Aug 2022 02:25:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB8F354F for ; Wed, 3 Aug 2022 02:25:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1659493504.5b70c9171330cdd689f9e736b66b23800f942310.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/efivar/, sys-libs/efivar/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/efivar/efivar-38.ebuild sys-libs/efivar/files/efivar-38-glibc-2.36.patch X-VCS-Directories: sys-libs/efivar/ sys-libs/efivar/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5b70c9171330cdd689f9e736b66b23800f942310 X-VCS-Branch: master Date: Wed, 3 Aug 2022 02:25:12 +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: 426af148-8684-40dc-96d6-39dbcc68013f X-Archives-Hash: 176ed40922e2d28c1dd71f5647e8ee70 commit: 5b70c9171330cdd689f9e736b66b23800f942310 Author: Sam James gentoo org> AuthorDate: Wed Aug 3 02:24:58 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 3 02:25:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b70c917 sys-libs/efivar: fix build w/ glibc 2.36 Closes: https://bugs.gentoo.org/863230 Signed-off-by: Sam James gentoo.org> sys-libs/efivar/efivar-38.ebuild | 1 + sys-libs/efivar/files/efivar-38-glibc-2.36.patch | 46 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/sys-libs/efivar/efivar-38.ebuild b/sys-libs/efivar/efivar-38.ebuild index eecc85f7cbca..e17d33968234 100644 --- a/sys-libs/efivar/efivar-38.ebuild +++ b/sys-libs/efivar/efivar-38.ebuild @@ -34,6 +34,7 @@ src_prepare() { "${FILESDIR}"/efivar-38-Makefile-dep.patch "${FILESDIR}"/efivar-38-binutils-2.36.patch "${FILESDIR}"/efivar-38-ld-locale.patch + "${FILESDIR}"/efivar-38-glibc-2.36.patch ) default } diff --git a/sys-libs/efivar/files/efivar-38-glibc-2.36.patch b/sys-libs/efivar/files/efivar-38-glibc-2.36.patch new file mode 100644 index 000000000000..0a7e5f2e099c --- /dev/null +++ b/sys-libs/efivar/files/efivar-38-glibc-2.36.patch @@ -0,0 +1,46 @@ +https://github.com/rhboot/efivar/commit/bc65d63ebf8fe6ac8a099ff15ca200986dba1565 +https://bugs.gentoo.org/863230 + +From: Robbie Harwood +Date: Thu, 28 Jul 2022 16:11:24 -0400 +Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts) + +glibc has decided that sys/mount.h and linux/mount.h are no longer +usable at the same time. This broke the build, since linux/fs.h itself +includes linux/mount.h. For now, fix the build by only including +sys/mount.h where we need it. + +See-also: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E +Resolves: #227 +Signed-off-by: Robbie Harwood +--- a/src/gpt.c ++++ b/src/gpt.c +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/src/linux.c ++++ b/src/linux.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/src/util.h ++++ b/src/util.h +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + #include + #include + #include +