mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-13 19:29:53 +03:00
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
Patch-Source: https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96
|
|
|
|
From 287a00d364990edbb621fe5e392aeb550135fb96 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Tue, 3 Jan 2023 09:54:50 -0800
|
|
Subject: [PATCH] Do not use LFS64 functions on linux/musl (#2589)
|
|
|
|
On musl, off_t is 64bit always ( even on 32bit platforms ), therefore
|
|
using LFS64 funcitons is not needed on such platforms. Moreover, musl
|
|
has stopped providing aliases for these functions [1] which means it
|
|
wont compile on newer musl systems. Therefore only use it on 32bit
|
|
glibc/linux platforms and exclude musl like cygwin or OSX
|
|
|
|
[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
include/spdlog/details/os-inl.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h
|
|
index b9bab53ce..7f22335fb 100644
|
|
--- a/src/deps/couchbase-cxx-client/third_party/spdlog/include/spdlog/details/os-inl.h
|
|
+++ b/src/deps/couchbase-cxx-client/third_party/spdlog/include/spdlog/details/os-inl.h
|
|
@@ -236,8 +236,8 @@ SPDLOG_INLINE size_t filesize(FILE *f)
|
|
# else
|
|
int fd = ::fileno(f);
|
|
# endif
|
|
-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
|
|
-# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
|
|
+// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
|
|
+# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
|
|
struct stat64 st;
|
|
if (::fstat64(fd, &st) == 0)
|
|
{
|