From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A39A315806E for ; Sat, 27 May 2023 03:07:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9125FE0845; Sat, 27 May 2023 03:07:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73FC2E0845 for ; Sat, 27 May 2023 03:07:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6198E340EFA for ; Sat, 27 May 2023 03:07:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8D75A6D for ; Sat, 27 May 2023 03:06:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685156578.3c28815d55e0281a356bed17449b012b27c08c07.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/, dev-libs/spdlog/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/spdlog/files/spdlog-musl-1.2.4.patch dev-libs/spdlog/spdlog-1.11.0-r1.ebuild dev-libs/spdlog/spdlog-1.11.0.ebuild X-VCS-Directories: dev-libs/spdlog/files/ dev-libs/spdlog/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3c28815d55e0281a356bed17449b012b27c08c07 X-VCS-Branch: master Date: Sat, 27 May 2023 03:06:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8992bca0-48ac-4c8e-9db2-04b5b33918ee X-Archives-Hash: 78345bd9f16de80ef7fe4240e80fa247 commit: 3c28815d55e0281a356bed17449b012b27c08c07 Author: Sam James gentoo org> AuthorDate: Sat May 27 03:02:58 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 27 03:02:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c28815d dev-libs/spdlog: fix build w/ musl-1.2.4 Closes: https://bugs.gentoo.org/906954 Signed-off-by: Sam James gentoo.org> dev-libs/spdlog/files/spdlog-musl-1.2.4.patch | 30 ++++++++++++++++++++++ ...pdlog-1.11.0.ebuild => spdlog-1.11.0-r1.ebuild} | 1 + 2 files changed, 31 insertions(+) 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 +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 +--- 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 similarity index 96% rename from dev-libs/spdlog/spdlog-1.11.0.ebuild rename to 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() {