mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
spdlog: Do not use LFS64 functions with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+30
@@ -0,0 +1,30 @@
|
|||||||
|
From ce7a593e74c8e0c2ece15c73e7614d4f13a19a53 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Fri, 30 Dec 2022 13:04:08 -0800
|
||||||
|
Subject: [PATCH] Do not use LFS64 functions on linux/musl
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/gabime/spdlog/pull/2589]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
include/spdlog/details/os.h | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/include/spdlog/details/os-inl.h
|
||||||
|
+++ b/include/spdlog/details/os-inl.h
|
||||||
|
@@ -237,7 +237,7 @@ SPDLOG_INLINE size_t filesize(FILE *f)
|
||||||
|
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))
|
||||||
|
+# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
|
||||||
|
struct stat64 st;
|
||||||
|
if (::fstat64(fd, &st) == 0)
|
||||||
|
{
|
||||||
@@ -4,7 +4,9 @@ LICENSE = "MIT"
|
|||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
|
||||||
|
|
||||||
SRCREV = "ad0e89cbfb4d0c1ce4d097e134eb7be67baebb36"
|
SRCREV = "ad0e89cbfb4d0c1ce4d097e134eb7be67baebb36"
|
||||||
SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x"
|
SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x \
|
||||||
|
file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch \
|
||||||
|
"
|
||||||
|
|
||||||
DEPENDS += "fmt"
|
DEPENDS += "fmt"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user