CVS commit: pkgsrc/devel/spdlog

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Jan 18 14:17:22 UTC 2022

Modified Files:
        pkgsrc/devel/spdlog: Makefile PLIST

Log Message:
spdlog: build as dynamic library instead of static

Got relocation errors while linking gnuradio on Linux with the static
library due to missing -fPIC.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/spdlog/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/spdlog/PLIST

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.6 pkgsrc/devel/spdlog/Makefile:1.7
--- pkgsrc/devel/spdlog/Makefile:1.6    Fri Apr  2 08:32:57 2021
+++ pkgsrc/devel/spdlog/Makefile        Tue Jan 18 14:17:22 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2021/04/02 08:32:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/18 14:17:22 tnn Exp $
 
 DISTNAME=              spdlog-1.8.5
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=gabime/}
 GITHUB_PROJECT=                spdlog
@@ -14,8 +15,25 @@ LICENSE=             mit
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config
 USE_CMAKE=             yes
+CMAKE_ARGS+=           -DSPDLOG_BUILD_SHARED=ON
 
-PKGCONFIG_OVERRIDE+=           cmake/spdlog.pc.in
+PKGCONFIG_OVERRIDE+=   cmake/spdlog.pc.in
+
+# This doesn't work due to mk/plist bug. See tech-pkg@
+#PLIST_VARS+=          dylib notdylib
+#PLIST.dylib.Darwin=   yes
+#PLIST.dylib.Darwin=
+#PLIST.nodylib.Darwin=
+#PLIST.notdylib.*=     yes
+
+OPSYSVARS+=            SOEXT DYLIB NOTDYLIB
+PLIST_SUBST+=          SOEXT=${SOEXT} PLIST.dylib=${DYLIB} PLIST.notdylib=${NOTDYLIB}
+SOEXT.Darwin=          dylib
+SOEXT.*=               so
+DYLIB.Darwin=
+DYLIB.*=               @comment
+NOTDYLIB.Darwin=       @comment
+NOTDYLIB.*=
 
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/spdlog/PLIST
diff -u pkgsrc/devel/spdlog/PLIST:1.4 pkgsrc/devel/spdlog/PLIST:1.5
--- pkgsrc/devel/spdlog/PLIST:1.4       Fri Apr  2 08:32:57 2021
+++ pkgsrc/devel/spdlog/PLIST   Tue Jan 18 14:17:22 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/04/02 08:32:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/01/18 14:17:22 tnn Exp $
 include/spdlog/async.h
 include/spdlog/async_logger-inl.h
 include/spdlog/async_logger.h
@@ -94,5 +94,9 @@ lib/cmake/spdlog/spdlogConfig.cmake
 lib/cmake/spdlog/spdlogConfigTargets-release.cmake
 lib/cmake/spdlog/spdlogConfigTargets.cmake
 lib/cmake/spdlog/spdlogConfigVersion.cmake
-lib/libspdlog.a
+lib/libspdlog.${SOEXT}
+${PLIST.dylib}lib/libspdlog.1.${SOEXT}
+${PLIST.dylib}lib/libspdlog.${PKGVERSION}.${SOEXT}
+${PLIST.notdylib}lib/libspdlog.${SOEXT}.1
+${PLIST.notdylib}lib/libspdlog.${SOEXT}.${PKGVERSION}
 lib/pkgconfig/spdlog.pc