From 56dff418b8fb00edba4b8b363f869eab5cdce105 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 31 Dec 2022 14:16:31 -0800 Subject: spdlog: Do not use LFS64 functions with musl Signed-off-by: Khem Raj --- ...-Do-not-use-LFS64-functions-on-linux-musl.patch | 30 ++++++++++++++++++++++ meta-oe/recipes-support/spdlog/spdlog_1.11.0.bb | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch b/meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch new file mode 100644 index 0000000000..b997389aa2 --- /dev/null +++ b/meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch @@ -0,0 +1,30 @@ +From ce7a593e74c8e0c2ece15c73e7614d4f13a19a53 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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) + { diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.11.0.bb b/meta-oe/recipes-support/spdlog/spdlog_1.11.0.bb index 2c71331ffa..ec985fb039 100644 --- a/meta-oe/recipes-support/spdlog/spdlog_1.11.0.bb +++ b/meta-oe/recipes-support/spdlog/spdlog_1.11.0.bb @@ -4,7 +4,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" 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" -- cgit v1.2.3-54-g00ecf