CVS commit: pkgsrc/devel/spdlog

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov 26 13:47:13 UTC 2022

Modified Files:
        pkgsrc/devel/spdlog: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/spdlog/patches: patch-include_spdlog_tweakme.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/spdlog/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/spdlog/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/spdlog/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/spdlog/patches/patch-include_spdlog_tweakme.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/spdlog/Makefile
diff -u pkgsrc/devel/spdlog/Makefile:1.13 pkgsrc/devel/spdlog/Makefile:1.14
--- pkgsrc/devel/spdlog/Makefile:1.13   Sat Nov 12 15:06:06 2022
+++ pkgsrc/devel/spdlog/Makefile        Sat Nov 26 13:47:13 2022
@@ -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 @@ CONFIGURE_DIRS=       _build
 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"

Index: pkgsrc/devel/spdlog/buildlink3.mk
diff -u pkgsrc/devel/spdlog/buildlink3.mk:1.3 pkgsrc/devel/spdlog/buildlink3.mk:1.4
--- pkgsrc/devel/spdlog/buildlink3.mk:1.3       Wed Oct 19 18:27:53 2022
+++ pkgsrc/devel/spdlog/buildlink3.mk   Sat Nov 26 13:47:13 2022
@@ -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 @@ SPDLOG_BUILDLINK3_MK:=
 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
 

Index: pkgsrc/devel/spdlog/distinfo
diff -u pkgsrc/devel/spdlog/distinfo:1.12 pkgsrc/devel/spdlog/distinfo:1.13
--- pkgsrc/devel/spdlog/distinfo:1.12   Sat Nov 12 15:06:06 2022
+++ pkgsrc/devel/spdlog/distinfo        Sat Nov 26 13:47:13 2022
@@ -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

Added files:

Index: pkgsrc/devel/spdlog/patches/patch-include_spdlog_tweakme.h
diff -u /dev/null pkgsrc/devel/spdlog/patches/patch-include_spdlog_tweakme.h:1.1
--- /dev/null   Sat Nov 26 13:47:13 2022
+++ pkgsrc/devel/spdlog/patches/patch-include_spdlog_tweakme.h  Sat Nov 26 13:47:13 2022
@@ -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
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ ///////////////////////////////////////////////////////////////////////////////