Sat Jul 22 12:15:22 2023 UTC ()
spdlog: Set USE_CXX_FEATURES.

Do not set USE_LANGUAGES to c++11, it sets it itself.


(nia)
diff -r1.17 -r1.18 pkgsrc/devel/spdlog/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/spdlog/buildlink3.mk
cvs diff -r1.17 -r1.18 pkgsrc/devel/spdlog/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/spdlog/Makefile 2023/07/18 04:59:01 1.17
+++ pkgsrc/devel/spdlog/Makefile 2023/07/22 12:15:22 1.18
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
1# $NetBSD: Makefile,v 1.17 2023/07/18 04:59:01 adam Exp $ 1# $NetBSD: Makefile,v 1.18 2023/07/22 12:15:22 nia Exp $
2 2
3DISTNAME= spdlog-1.12.0 3DISTNAME= spdlog-1.12.0
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=gabime/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=gabime/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
7 8
8MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= https://github.com/gabime/spdlog 10HOMEPAGE= https://github.com/gabime/spdlog
10COMMENT= Fast C++ logging library 11COMMENT= Fast C++ logging library
11LICENSE= mit 12LICENSE= mit
12 13
13USE_LANGUAGES= c c++11 14USE_LANGUAGES= c c++
14USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
15CMAKE_ARGS+= -DSPDLOG_BUILD_SHARED=ON 16CMAKE_ARGS+= -DSPDLOG_BUILD_SHARED=ON
16CMAKE_ARGS+= -DSPDLOG_FMT_EXTERNAL=ON 17CMAKE_ARGS+= -DSPDLOG_FMT_EXTERNAL=ON
17 18
 19USE_CXX_FEATURES+= c++11 put_time
 20
18PKGCONFIG_OVERRIDE+= cmake/spdlog.pc.in 21PKGCONFIG_OVERRIDE+= cmake/spdlog.pc.in
19 22
20LDFLAGS.SunOS+= -lsocket 23LDFLAGS.SunOS+= -lsocket
21 24
22post-install: 25post-install:
23 ${FIND} ${DESTDIR} -name '*.orig' -exec rm -f '{}' ';' 26 ${FIND} ${DESTDIR} -name '*.orig' -exec rm -f '{}' ';'
24 27
25.include "../../devel/cmake/build.mk" 28.include "../../devel/cmake/build.mk"
26.include "../../lang/python/tool.mk" 29.include "../../lang/python/tool.mk"
27.include "../../textproc/fmtlib/buildlink3.mk" 30.include "../../textproc/fmtlib/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/devel/spdlog/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/spdlog/buildlink3.mk 2023/05/16 21:20:49 1.6
+++ pkgsrc/devel/spdlog/buildlink3.mk 2023/07/22 12:15:22 1.7
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.6 2023/05/16 21:20:49 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2023/07/22 12:15:22 nia Exp $
2 2
3BUILDLINK_TREE+= spdlog 3BUILDLINK_TREE+= spdlog
4 4
5.if !defined(SPDLOG_BUILDLINK3_MK) 5.if !defined(SPDLOG_BUILDLINK3_MK)
6SPDLOG_BUILDLINK3_MK:= 6SPDLOG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.spdlog+= spdlog>=1.8.5nb1 8BUILDLINK_API_DEPENDS.spdlog+= spdlog>=1.8.5nb1
9BUILDLINK_ABI_DEPENDS.spdlog?= spdlog>=1.11.0nb2 9BUILDLINK_ABI_DEPENDS.spdlog?= spdlog>=1.11.0nb2
10BUILDLINK_PKGSRCDIR.spdlog?= ../../devel/spdlog 10BUILDLINK_PKGSRCDIR.spdlog?= ../../devel/spdlog
11 11
12# Support the use of SPDLOG_FMT_EXTERNAL. 12# Support the use of SPDLOG_FMT_EXTERNAL.
13# Sometimes tweakme.h is not properly applied... 13# Sometimes tweakme.h is not properly applied...
14BUILDLINK_CPPFLAGS.spdlog+= -DSPDLOG_FMT_EXTERNAL 14BUILDLINK_CPPFLAGS.spdlog+= -DSPDLOG_FMT_EXTERNAL
15 15
 16USE_CXX_FEATURES+= c++11 put_time
 17
16.include "../../textproc/fmtlib/buildlink3.mk" 18.include "../../textproc/fmtlib/buildlink3.mk"
17.endif # SPDLOG_BUILDLINK3_MK 19.endif # SPDLOG_BUILDLINK3_MK
18 20
19BUILDLINK_TREE+= -spdlog 21BUILDLINK_TREE+= -spdlog