diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-05-27 09:11:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-27 09:11:36 +0100 |
| commit | e67c9b35124c5b3338943cf7793fe4402f03ad0f (patch) | |
| tree | ae666570705e3bb470ce37171e065978b46063f5 /dev-libs/spdlog | |
| parent | 9e68aee0e16e4b361fe06f9566c74b4bb2a22a27 (diff) | |
gentoo auto-resync : 27:05:2023 - 09:11:36
Diffstat (limited to 'dev-libs/spdlog')
| -rw-r--r-- | dev-libs/spdlog/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/spdlog/files/spdlog-musl-1.2.4.patch | 30 | ||||
| -rw-r--r-- | dev-libs/spdlog/spdlog-1.11.0-r1.ebuild (renamed from dev-libs/spdlog/spdlog-1.11.0.ebuild) | 1 |
3 files changed, 33 insertions, 1 deletions
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index 9a67c8ac2f14..e903033cf4dd 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1,5 +1,6 @@ AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692 +AUX spdlog-musl-1.2.4.patch 1428 BLAKE2B 22d1c0ada761c52f29e1a4dff0c16140741d78f878d14fc78fbfde9dbf7a73fe08e3b0bfa22c9e0ccfa4f631459bb6349c6a33f0e6ba5f646c2e56e731831bbe SHA512 8cc281e126eb0246a13880487a667e8672eb190810698b0737dd1211153e3b158e13a0bba8c57f8e72f5f3f0532b856c9ef9ab6c5825c694cb96c02877a73151 DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf3967cfbd619234ab0ca2d0c15bddb27b73ce43c33623d02fb046f621933cd52cf39f377f354182d9cdab33340f28 SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 -EBUILD spdlog-1.11.0.ebuild 991 BLAKE2B 6538e5fb820081f85cc44d28302f66afed3c4e5b45a8ca3df6e7316bedd9f02330b874b5d01099c045a2a09f9253624d7459422006c4578641119c59aa25bd81 SHA512 a7605ada9603e60a2f476c00c3327c7a3aa62b53b3d4fed46ea226fa6dd6c569c94c7ddd0c71132d9d2b9f2c1e2ac4cb985bad8ec8a2b0ffa140b9e095370bf6 +EBUILD spdlog-1.11.0-r1.ebuild 1029 BLAKE2B 3b9ce33c846d6be67b843be7a5f33ebdfd7ea0cc30393eeaa839c95df57825abb28178750def8950c880e86acdfdf4b5a6da40d089ae0490923631dc5e2c765b SHA512 fb4c3ec3dfc90eb292d92fcb7ee3a6f23c655ec4dc4264f34b0f7a1413c46891b0ee55000653e60cefa5367a98a324795ea2fde21c095c546d03383289c72140 EBUILD spdlog-9999.ebuild 997 BLAKE2B 63ee00aedfb9a4aa437a72ed2d41dc28e590cb50c76476733ef5ee895ed5e2fe0b16f3ec0dce562a05bdcd5f373df2f657735ad30890a1eb1a4cec5b86422dcc SHA512 2628758065ca9a8bc93ad99c4c0f930b6aa7bb44a75e80a40cd781597124ab81f3e38e24e327401adb2128e5d909c3f46c500f1578bb198f8b47c23a566efd74 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c diff --git a/dev-libs/spdlog/files/spdlog-musl-1.2.4.patch b/dev-libs/spdlog/files/spdlog-musl-1.2.4.patch new file mode 100644 index 000000000000..cd1240d36f46 --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-musl-1.2.4.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/906954 +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> +--- a/include/spdlog/details/os-inl.h ++++ b/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) + { + diff --git a/dev-libs/spdlog/spdlog-1.11.0.ebuild b/dev-libs/spdlog/spdlog-1.11.0-r1.ebuild index ebda7ae2f4a2..311db3477688 100644 --- a/dev-libs/spdlog/spdlog-1.11.0.ebuild +++ b/dev-libs/spdlog/spdlog-1.11.0-r1.ebuild @@ -31,6 +31,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" + "${FILESDIR}/${PN}-musl-1.2.4.patch" ) src_prepare() { |