commit: 8fc3c52ac565e36599d32c3e43846cceac8c6e4f Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Tue Jun 13 07:46:19 2023 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Tue Jun 13 07:51:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc3c52a
sys-apps/gptfdisk: allow building against musl-1.2.4 Upstream fix backported to 1.0.9 by Violet Purcell <vimproved <AT> inventati.org>. Closes: https://bugs.gentoo.org/906151 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> .../gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch | 30 ++++++++++++++++++++++ sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch new file mode 100644 index 000000000000..6f019d9eec6f --- /dev/null +++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch @@ -0,0 +1,30 @@ +Upstream: https://sourceforge.net/p/gptfdisk/code/ci/7dfa8984f5a30f313d8675ff6097c8592d636d10/ + +From 7dfa8984f5a30f313d8675ff6097c8592d636d10 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.k...@gmail.com> +Date: Mon, 12 Dec 2022 12:50:07 -0800 +Subject: [PATCH] Use 64bit time_t on linux as well + +Alias 64bit version of stat functions to original functions +we are already passing -D_FILE_OFFSET_BITS=64 in linux Makefile + +Signed-off-by: Khem Raj <raj.k...@gmail.com> +--- a/diskio-unix.cc ++++ b/diskio-unix.cc +@@ -37,8 +37,12 @@ + + using namespace std; + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__linux__) + #define off64_t off_t ++#define stat64 stat ++#define fstat64 fstat ++#define lstat64 lstat ++#define lseek64 lseek + #endif + + // Returns the official "real" name for a shortened version of same. +-- +2.41.0 + diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild index e7ed4b517d0d..94027ea21f26 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,6 +33,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.0.9-libuuid.patch" #844073 "${FILESDIR}/${PN}-1.0.9-popt_segv.patch" #872131 + "${FILESDIR}"/${PN}-1.0.9-musl-1.2.4.patch ) src_prepare() {
