Sat Nov 12 15:06:07 2022 UTC ()
spdlog: Fix shared library symlink name

And do not build in source directory for easier debugging.


(ryoon)
diff -r1.12 -r1.13 pkgsrc/devel/spdlog/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/spdlog/distinfo
diff -r0 -r1.1 pkgsrc/devel/spdlog/patches/patch-CMakeLists.txt
cvs diff -r1.12 -r1.13 pkgsrc/devel/spdlog/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/spdlog/Makefile 2022/11/11 18:36:47 1.12
+++ pkgsrc/devel/spdlog/Makefile 2022/11/12 15:06:06 1.13
@@ -1,25 +1,31 @@ @@ -1,25 +1,31 @@
1# $NetBSD: Makefile,v 1.12 2022/11/11 18:36:47 adam Exp $ 1# $NetBSD: Makefile,v 1.13 2022/11/12 15:06:06 ryoon Exp $
2 2
3DISTNAME= spdlog-1.11.0 3DISTNAME= spdlog-1.11.0
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=gabime/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=gabime/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= https://github.com/gabime/spdlog 9HOMEPAGE= https://github.com/gabime/spdlog
10COMMENT= Fast C++ logging library 10COMMENT= Fast C++ logging library
11LICENSE= mit 11LICENSE= mit
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES= c c++11 14USE_LANGUAGES= c c++11
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16CMAKE_ARGS+= -DSPDLOG_BUILD_SHARED=ON 16CMAKE_ARGS+= -DSPDLOG_BUILD_SHARED=ON
17CMAKE_ARGS+= -DSPDLOG_FMT_EXTERNAL=ON 17CMAKE_ARGS+= -DSPDLOG_FMT_EXTERNAL=ON
18 18
19PKGCONFIG_OVERRIDE+= cmake/spdlog.pc.in 19PKGCONFIG_OVERRIDE+= cmake/spdlog.pc.in
20 20
21LDFLAGS.SunOS+= -lsocket 21LDFLAGS.SunOS+= -lsocket
22 22
 23CMAKE_ARG_PATH= ..
 24CONFIGURE_DIRS= _build
 25
 26pre-configure:
 27 ${MKDIR} ${WRKSRC}/_build
 28
23.include "../../lang/python/tool.mk" 29.include "../../lang/python/tool.mk"
24.include "../../textproc/fmtlib/buildlink3.mk" 30.include "../../textproc/fmtlib/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/devel/spdlog/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/spdlog/distinfo 2022/11/11 18:36:47 1.11
+++ pkgsrc/devel/spdlog/distinfo 2022/11/12 15:06:06 1.12
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.11 2022/11/11 18:36:47 adam Exp $ 1$NetBSD: distinfo,v 1.12 2022/11/12 15:06:06 ryoon Exp $
2 2
3BLAKE2s (spdlog-1.11.0.tar.gz) = b6fdf69002f5591045e8377fc02a20da4090676d786d9348cc5ed2404f26fc03 3BLAKE2s (spdlog-1.11.0.tar.gz) = b6fdf69002f5591045e8377fc02a20da4090676d786d9348cc5ed2404f26fc03
4SHA512 (spdlog-1.11.0.tar.gz) = 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 4SHA512 (spdlog-1.11.0.tar.gz) = 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
5Size (spdlog-1.11.0.tar.gz) = 373033 bytes 5Size (spdlog-1.11.0.tar.gz) = 373033 bytes
 6SHA1 (patch-CMakeLists.txt) = 7da54588522ca9cf4b1816d6f65a8f31eda43332
File Added: pkgsrc/devel/spdlog/patches/patch-CMakeLists.txt
$NetBSD: patch-CMakeLists.txt,v 1.1 2022/11/12 15:06:06 ryoon Exp $

* Fix shared library name.
  Do not create libspdlog.so.1.11 symlink.

--- CMakeLists.txt.orig	2022-11-02 21:13:08.000000000 +0000
+++ CMakeLists.txt
@@ -176,7 +176,7 @@ target_include_directories(spdlog PUBLIC
 target_link_libraries(spdlog PUBLIC Threads::Threads)
 spdlog_enable_warnings(spdlog)
 
-set_target_properties(spdlog PROPERTIES VERSION ${SPDLOG_VERSION} SOVERSION ${SPDLOG_VERSION_MAJOR}.${SPDLOG_VERSION_MINOR})
+set_target_properties(spdlog PROPERTIES VERSION ${SPDLOG_VERSION} SOVERSION ${SPDLOG_VERSION_MAJOR})
 set_target_properties(spdlog PROPERTIES DEBUG_POSTFIX d)
 
 if(COMMAND target_precompile_headers AND SPDLOG_ENABLE_PCH)