CVS commit: pkgsrc/databases/mongodb3

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Aug  2 00:14:13 UTC 2024

Modified Files:
        pkgsrc/databases/mongodb3: Makefile

Log Message:
databases/mongodb3: Remediate icu, fixing build on NetBSD 9

Declare that a C++11 compiler is needed.  (This has surely been true
for a very long time, but wasn't in the Makefile.)

Recently icu apparently grew a requirement that files including icu
headers be compiled as C++17, and this package was therefore marked to
ask for C++17.  That apparently worked on NetBSD 10, but on NetBSD 9,
it failed to build.   Resolve this by removing the C++17 FORCE_CXX_STD
(which makes no sense for mongodb3 which needs C++11), and use the
included icu, taking a hint from how included boost is used.

(This is a pullup candidate for 2024Q2, should anyone else care and
want to do that.)


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/mongodb3/Makefile

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

Modified files:

Index: pkgsrc/databases/mongodb3/Makefile
diff -u pkgsrc/databases/mongodb3/Makefile:1.36 pkgsrc/databases/mongodb3/Makefile:1.37
--- pkgsrc/databases/mongodb3/Makefile:1.36     Sat Jun  8 22:49:45 2024
+++ pkgsrc/databases/mongodb3/Makefile  Fri Aug  2 00:14:13 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2024/06/08 22:49:45 gdt Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/02 00:14:13 gdt Exp $
 
 # This package is intentionally old to avoid:
 #   Server Side Public License
 DISTNAME=      mongodb-src-r3.4.24
 PKGNAME=       ${DISTNAME:S/src-r//}
-PKGREVISION=   22
+PKGREVISION=   23
 CATEGORIES=    databases
 MASTER_SITES=  http://fastdl.mongodb.org/src/
 
@@ -20,8 +20,7 @@ EXTRACT_USING=        bsdtar
 
 NO_CONFIGURE=  yes
 USE_LANGUAGES= c c++
-
-FORCE_CXX_STD+=        c++17
+USE_CXX_FEATURES+=     c++11
 
 SCONS_ARGS=    ${_MAKE_JOBS}
 SCONS_ARGS+=   --dbg=off # on: argument parsing problem
@@ -30,7 +29,8 @@ SCONS_ARGS+=  --release
 SCONS_ARGS+=   --runtime-hardening=off # on: does not produce executables
 # incompatible with latest boost version, missing boost/filesystem/convenience.hpp
 #SCONS_ARGS+=  --use-system-boost
-SCONS_ARGS+=   --use-system-icu
+# incompatible with latest icu, which (buggily) forces too-new C++
+#SCONS_ARGS+=  --use-system-icu
 SCONS_ARGS+=   --use-system-pcre
 SCONS_ARGS+=   --use-system-snappy
 SCONS_ARGS+=   --use-system-tcmalloc
@@ -152,6 +152,5 @@ post-install:
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"