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 0221215814C for ; Mon, 18 Sep 2023 09:01:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E8DB2BC030; Mon, 18 Sep 2023 09:01:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 2A63C2BC030 for ; Mon, 18 Sep 2023 09:01:54 +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 6E548335C9F for ; Mon, 18 Sep 2023 09:01:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA55611D6 for ; Mon, 18 Sep 2023 09:01:51 +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: <1695027116.03f6b6cdc6dcb889208e1c32100f58a2b4d6eab6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/debugedit/files/, dev-util/debugedit/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/debugedit/debugedit-5.0-r1.ebuild dev-util/debugedit/debugedit-5.0-r2.ebuild dev-util/debugedit/files/debugedit-5.0-musl-1.2.4.patch X-VCS-Directories: dev-util/debugedit/files/ dev-util/debugedit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 03f6b6cdc6dcb889208e1c32100f58a2b4d6eab6 X-VCS-Branch: master Date: Mon, 18 Sep 2023 09:01:51 +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: 9a320298-496f-4acb-ba25-26803b5eb161 X-Archives-Hash: 408e038b41a4e8e1c6df2b5ea353f2aa commit: 03f6b6cdc6dcb889208e1c32100f58a2b4d6eab6 Author: Violet Purcell inventati org> AuthorDate: Mon Jun 26 21:52:52 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Sep 18 08:51:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f6b6cd dev-util/debugedit: Fix build on musl 1.2.4 Signed-off-by: Violet Purcell inventati.org> Closes: https://github.com/gentoo/gentoo/pull/31631 Signed-off-by: Sam James gentoo.org> ...gedit-5.0-r1.ebuild => debugedit-5.0-r2.ebuild} | 3 ++ .../debugedit/files/debugedit-5.0-musl-1.2.4.patch | 38 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dev-util/debugedit/debugedit-5.0-r1.ebuild b/dev-util/debugedit/debugedit-5.0-r2.ebuild similarity index 92% rename from dev-util/debugedit/debugedit-5.0-r1.ebuild rename to dev-util/debugedit/debugedit-5.0-r2.ebuild index 6ec21d7d3bb5..eef678585541 100644 --- a/dev-util/debugedit/debugedit-5.0-r1.ebuild +++ b/dev-util/debugedit/debugedit-5.0-r2.ebuild @@ -35,6 +35,9 @@ PATCHES=( "${FILESDIR}"/${P}-zero-dir-entry.patch "${FILESDIR}"/${P}-hppa.patch "${FILESDIR}"/${P}-musl-error.h-fix.patch + + # Upstreamed, remove next release + "${FILESDIR}"/${P}-musl-1.2.4.patch ) src_prepare() { diff --git a/dev-util/debugedit/files/debugedit-5.0-musl-1.2.4.patch b/dev-util/debugedit/files/debugedit-5.0-musl-1.2.4.patch new file mode 100644 index 000000000000..1fe01df67c2a --- /dev/null +++ b/dev-util/debugedit/files/debugedit-5.0-musl-1.2.4.patch @@ -0,0 +1,38 @@ +From 187ba161d1d18ad0d675115d8a9eee7ec1790074 Mon Sep 17 00:00:00 2001 +From: Violet Purcell +Date: Mon, 26 Jun 2023 21:46:20 +0000 +Subject: [PATCH] Fix build failure on musl 1.2.4 due to removal of LFS64 + compat symbols. + +--- a/tools/sepdebugcrcfix.c ++++ b/tools/sepdebugcrcfix.c +@@ -144,7 +144,7 @@ crc32 (const char *fname, const char *base_fname, uint32_t *crcp) + error (0, errno, _("cannot open \"%s\""), debugname); + return false; + } +- off64_t size = lseek64 (fd, 0, SEEK_END); ++ off_t size = lseek (fd, 0, SEEK_END); + if (size == -1) + { + error (0, errno, _("cannot get size of \"%s\""), debugname); +@@ -289,7 +289,7 @@ process (Elf *elf, int fd, const char *fname) + return true; + } + updated_count++; +- off64_t seekto = (shdr->sh_offset + data->d_off ++ off_t seekto = (shdr->sh_offset + data->d_off + + (crcp - (const uint8_t *) data->d_buf)); + uint32_t crc_targetendian = (ehdr->e_ident[EI_DATA] == ELFDATA2LSB + ? htole32 (crc) : htobe32 (crc)); +@@ -361,7 +361,7 @@ main (int argc, char **argv) + error (0, errno, _("cannot chmod \"%s\" to make sure we can read and write"), fname); + + bool failed = false; +- int fd = open64 (fname, O_RDWR); ++ int fd = open (fname, O_RDWR); + if (fd == -1) + { + error (0, errno, _("cannot open \"%s\""), fname); +-- +2.41.0 +