CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Nov 28 14:38:54 UTC 2022

Modified Files:
        pkgsrc/devel/spdlog: buildlink3.mk
        pkgsrc/games/nxengine-evo: Makefile

Log Message:
spdlog: Reduce size of hammer to bring in external fmtlib.

Some dependent packages link fine without fmtlib (eg. libixion)
and fmtlib ending up in their libtool file is causing problems
of its own.

This way only packages that are including those relevant fmtlib
symbols need to be explicitly linked against fmtlib.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/spdlog/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/nxengine-evo/Makefile

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/buildlink3.mk
diff -u pkgsrc/devel/spdlog/buildlink3.mk:1.4 pkgsrc/devel/spdlog/buildlink3.mk:1.5
--- pkgsrc/devel/spdlog/buildlink3.mk:1.4       Sat Nov 26 13:47:13 2022
+++ pkgsrc/devel/spdlog/buildlink3.mk   Mon Nov 28 14:38:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2022/11/26 13:47:13 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/11/28 14:38:53 nia Exp $
 
 BUILDLINK_TREE+=       spdlog
 
@@ -11,7 +11,6 @@ BUILDLINK_PKGSRCDIR.spdlog?=  ../../devel
 # 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/games/nxengine-evo/Makefile
diff -u pkgsrc/games/nxengine-evo/Makefile:1.10 pkgsrc/games/nxengine-evo/Makefile:1.11
--- pkgsrc/games/nxengine-evo/Makefile:1.10     Sun Sep 11 12:51:45 2022
+++ pkgsrc/games/nxengine-evo/Makefile  Mon Nov 28 14:38:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/09/11 12:51:45 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/11/28 14:38:53 nia Exp $
 
 PKGNAME=       nxengine-evo-2.6.5.1
 PKGREVISION=   4
@@ -20,6 +20,8 @@ USE_CMAKE=    yes
 USE_TOOLS+=    pax
 USE_LANGUAGES= c c++
 
+LDFLAGS+=      -lfmt
+
 WRKSRC=                ${WRKDIR}/nxengine-evo-2.6.5-1
 
 ALL_ENV+=      SDL2DIR=${PREFIX}