tb/contrib
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

spdlog: use external fmt libs for dependent ports

Browse Source
This commit is contained in:
Tim Biermann 2023-07-30 19:41:36 +02:00
parent 9d0cf74017
commit 70b2c98c54
Signed by: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spdlog/.signature
View File

@ -1,5 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF36XnWQOeVOv4tCxkEO9BbK9DcPS4HvX9IEH8C0OJbb4XGnXkJ6w0gbLvNjXHziMjP0Om5iAETjyve1qGC/7JKA4= RWSagIOpLGJF33uafkgUcDPME/q3py3BZw7GS2YgVB3sxhrydXjylfQrDMr7K0aFcrdz9nip8kSzvIQcLpfi9NtFDDTJb4afAQw=
SHA256 (Pkgfile) = 078b0a514b8c7c438fb37965dbb690e71b291bebee9788b6101d9ffb4789cd7f SHA256 (Pkgfile) = e7eb01ca6d971eba3cb4c27b3a80e2580711f1b25f98dee03318c16d59c152fd
SHA256 (.footprint) = 7fbb17d3d7fbda8347ba5505c64f855e027eba533ee74b9ad34f7809f734db7e SHA256 (.footprint) = 7fbb17d3d7fbda8347ba5505c64f855e027eba533ee74b9ad34f7809f734db7e
SHA256 (spdlog-1.12.0.tar.gz) = 4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9 SHA256 (spdlog-1.12.0.tar.gz) = 4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9
SHA256 (d8d23a660601a406a1e1aa07380b5b1c5781c190.patch) = edfaa7406e609908c6cf1d09132506fcaaa585034be7093403eb78275ecfff5e
SHA256 (spdlog_fmt_external.patch) = a0eb34b7c6920f0db2587460071f53372663c191cdfe34bf5ea2704c309c745f

11
spdlog/Pkgfile
View File

@ -5,10 +5,17 @@
name=spdlog name=spdlog
version=1.12.0 version=1.12.0
release=1 release=2
source=(https://github.com/gabime/spdlog/archive/v$version/$name-$version.tar.gz) source=(https://github.com/gabime/spdlog/archive/v$version/$name-$version.tar.gz
d8d23a660601a406a1e1aa07380b5b1c5781c190.patch
spdlog_fmt_external.patch)
build() { build() {
patch -Np1 -d $name-$version -i $SRC/spdlog_fmt_external.patch
patch -Np1 -d $name-$version -i $SRC/d8d23a660601a406a1e1aa07380b5b1c5781c190.patch
rm -rf $name-$version/include/spdlog/fmt/bundled
cmake -S $name-$version -B build -G Ninja \ cmake -S $name-$version -B build -G Ninja \
-D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_INSTALL_LIBDIR=lib \

22
spdlog/d8d23a660601a406a1e1aa07380b5b1c5781c190.patch Normal file
View File

@ -0,0 +1,22 @@
From d8d23a660601a406a1e1aa07380b5b1c5781c190 Mon Sep 17 00:00:00 2001
From: Gabi Melman <gmelman1@gmail.com>
Date: Fri, 21 Jul 2023 00:37:03 +0300
Subject: [PATCH] Fix #2820
---
include/spdlog/details/circular_q.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/spdlog/details/circular_q.h b/include/spdlog/details/circular_q.h
index e4fd5fd4a..d40e14189 100644
--- a/include/spdlog/details/circular_q.h
+++ b/include/spdlog/details/circular_q.h
@@ -82,7 +82,7 @@ class circular_q
}
else
{
- return max_items_ - (head_ - tail_);
+ return max_items_ - 1 - (head_ - tail_);
}
}

11
spdlog/spdlog_fmt_external.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/include/spdlog/tweakme.h 2023-01-02 09:57:15.667781832 -0800
+++ b/include/spdlog/tweakme.h 2023-01-02 09:57:17.761105926 -0800
@@ -78,7 +78,7 @@
// In this case spdlog will try to include <fmt/format.h> so set your -I flag
// accordingly.
//
-// #define SPDLOG_FMT_EXTERNAL
+#define SPDLOG_FMT_EXTERNAL
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////