[pkgsrc/trunk]: pkgsrc/devel/spdlog spdlog: Fix building of dependent package...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/91495c9ffe74
branches:  trunk
changeset: 388763:91495c9ffe74
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Nov 26 13:47:13 2022 +0000

description:
spdlog: Fix building of dependent packages (e.g. nxengine-evo)

diffstat:

 devel/spdlog/Makefile                               |   6 +++++-
 devel/spdlog/buildlink3.mk                          |   7 ++++++-
 devel/spdlog/distinfo                               |   3 ++-
 devel/spdlog/patches/patch-include_spdlog_tweakme.h |  15 +++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diffs (74 lines):

diff -r 74e62a1f51b9 -r 91495c9ffe74 devel/spdlog/Makefile
--- a/devel/spdlog/Makefile     Sat Nov 26 13:14:01 2022 +0000
+++ b/devel/spdlog/Makefile     Sat Nov 26 13:47:13 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2022/11/12 15:06:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2022/11/26 13:47:13 nia Exp $
 
 DISTNAME=      spdlog-1.11.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gabime/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -26,6 +27,9 @@
 pre-configure:
        ${MKDIR} ${WRKSRC}/_build
 
+post-install:
+       ${FIND} ${DESTDIR} -name '*.orig' -exec rm -f '{}' ';'
+
 .include "../../lang/python/tool.mk"
 .include "../../textproc/fmtlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 74e62a1f51b9 -r 91495c9ffe74 devel/spdlog/buildlink3.mk
--- a/devel/spdlog/buildlink3.mk        Sat Nov 26 13:14:01 2022 +0000
+++ b/devel/spdlog/buildlink3.mk        Sat Nov 26 13:47:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/10/19 18:27:53 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2022/11/26 13:47:13 nia Exp $
 
 BUILDLINK_TREE+=       spdlog
 
@@ -8,6 +8,11 @@
 BUILDLINK_API_DEPENDS.spdlog+= spdlog>=1.8.5nb1
 BUILDLINK_PKGSRCDIR.spdlog?=   ../../devel/spdlog
 
+# Support the use of SPDLOG_FMT_EXTERNAL.
+# Sometimes tweakme.h is not properly applied...
+BUILDLINK_CPPFLAGS.spdlog+=    -DSPDLOG_FMT_EXTERNAL
+BUILDLINK_LDFLAGS.spdlog+=     -lfmt
+
 .include "../../textproc/fmtlib/buildlink3.mk"
 .endif # SPDLOG_BUILDLINK3_MK
 
diff -r 74e62a1f51b9 -r 91495c9ffe74 devel/spdlog/distinfo
--- a/devel/spdlog/distinfo     Sat Nov 26 13:14:01 2022 +0000
+++ b/devel/spdlog/distinfo     Sat Nov 26 13:47:13 2022 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2022/11/12 15:06:06 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2022/11/26 13:47:13 nia Exp $
 
 BLAKE2s (spdlog-1.11.0.tar.gz) = b6fdf69002f5591045e8377fc02a20da4090676d786d9348cc5ed2404f26fc03
 SHA512 (spdlog-1.11.0.tar.gz) = 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
 Size (spdlog-1.11.0.tar.gz) = 373033 bytes
 SHA1 (patch-CMakeLists.txt) = 7da54588522ca9cf4b1816d6f65a8f31eda43332
+SHA1 (patch-include_spdlog_tweakme.h) = 0e3f16aaf013535331a11be523dd731503c12717
diff -r 74e62a1f51b9 -r 91495c9ffe74 devel/spdlog/patches/patch-include_spdlog_tweakme.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/spdlog/patches/patch-include_spdlog_tweakme.h       Sat Nov 26 13:47:13 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_spdlog_tweakme.h,v 1.1 2022/11/26 13:47:13 nia Exp $
+
+Allow dependent programs to find the correct fmtlib headers.
+
+--- include/spdlog/tweakme.h.orig      2022-11-02 21:13:08.000000000 +0000
++++ include/spdlog/tweakme.h
+@@ -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
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ ///////////////////////////////////////////////////////////////////////////////