CVS commit: pkgsrc/databases/mongodb

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul 24 18:39:28 UTC 2023

Modified Files:
        pkgsrc/databases/mongodb: Makefile

Log Message:
mongodb: convert to scons4

Bump PKGREVISION to be on the safe side.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/databases/mongodb/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/mongodb/Makefile
diff -u pkgsrc/databases/mongodb/Makefile:1.79 pkgsrc/databases/mongodb/Makefile:1.80
--- pkgsrc/databases/mongodb/Makefile:1.79      Tue Jul 18 14:03:58 2023
+++ pkgsrc/databases/mongodb/Makefile   Mon Jul 24 18:39:28 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2023/07/18 14:03:58 nia Exp $
+# $NetBSD: Makefile,v 1.80 2023/07/24 18:39:28 wiz Exp $
 
 DISTNAME=      mongodb-src-r4.2.15
 PKGNAME=       ${DISTNAME:S/src-r//}
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    databases
 MASTER_SITES=  http://fastdl.mongodb.org/src/
 
@@ -26,23 +26,23 @@ USE_LANGUAGES=      c99 c++17
 
 USE_TOOLS+=    pkg-config
 
-SCONS_ARGS=    ${_MAKE_JOBS}
-SCONS_ARGS+=   --dbg=off # on: argument parsing problem
-SCONS_ARGS+=   --disable-warnings-as-errors
-SCONS_ARGS+=   --release
-SCONS_ARGS+=   --runtime-hardening=off # on: does not produce executables
-#SCONS_ARGS+=  --use-system-asio
-SCONS_ARGS+=   --use-system-boost
-SCONS_ARGS+=   --use-system-icu
-SCONS_ARGS+=   --use-system-mongo-c
-SCONS_ARGS+=   --use-system-pcre
-SCONS_ARGS+=   --use-system-snappy
-SCONS_ARGS+=   --use-system-sqlite
-SCONS_ARGS+=   --use-system-tcmalloc
-#SCONS_ARGS+=  --use-system-wiredtiger
-SCONS_ARGS+=   --use-system-yaml
-SCONS_ARGS+=   --use-system-zlib
-SCONS_ARGS+=   --use-system-zstd
+SCONS_BUILD_ARGS=      ${_MAKE_JOBS}
+SCONS_BUILD_ARGS+=     --dbg=off # on: argument parsing problem
+SCONS_BUILD_ARGS+=     --disable-warnings-as-errors
+SCONS_BUILD_ARGS+=     --release
+SCONS_BUILD_ARGS+=     --runtime-hardening=off # on: does not produce executables
+#SCONS_BUILD_ARGS+=    --use-system-asio
+SCONS_BUILD_ARGS+=     --use-system-boost
+SCONS_BUILD_ARGS+=     --use-system-icu
+SCONS_BUILD_ARGS+=     --use-system-mongo-c
+SCONS_BUILD_ARGS+=     --use-system-pcre
+SCONS_BUILD_ARGS+=     --use-system-snappy
+SCONS_BUILD_ARGS+=     --use-system-sqlite
+SCONS_BUILD_ARGS+=     --use-system-tcmalloc
+#SCONS_BUILD_ARGS+=    --use-system-wiredtiger
+SCONS_BUILD_ARGS+=     --use-system-yaml
+SCONS_BUILD_ARGS+=     --use-system-zlib
+SCONS_BUILD_ARGS+=     --use-system-zstd
 
 USE_CXX_FEATURES+=     c++17
 
@@ -55,6 +55,15 @@ INCL_PATH+=  ${BUILDLINK_PREFIX.mongo-c-d
 INCL_PATH+=    ${BUILDLINK_PREFIX.mongo-c-driver}/include/libmongoc-1.0
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib
 
+SCONS_BUILD_ARGS+=     CC=${CC:Q}
+SCONS_BUILD_ARGS+=     CXX=${CXX:Q}
+SCONS_BUILD_ARGS+=     CFLAGS=${CFLAGS:Q}
+SCONS_BUILD_ARGS+=     CXXFLAGS=${CXXFLAGS:Q}
+SCONS_BUILD_ARGS+=     LINKFLAGS=${LDFLAGS:Q}
+SCONS_BUILD_ARGS+=     CPPPATH=${INCL_PATH:Q}
+SCONS_BUILD_ARGS+=     core
+SCONS_INSTALL_ARGS+=   --prefix=${DESTDIR}${PREFIX}
+
 .include "options.mk"
 
 SMF_METHODS+=          mongodb
@@ -145,17 +154,6 @@ post-extract:
 do-configure:
        ${DO_NADA}
 
-do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} \
-       CC=${CC:Q} CXX=${CXX:Q} CFLAGS=${CFLAGS:Q} CXXFLAGS=${CXXFLAGS:Q} \
-       LINKFLAGS=${LDFLAGS:Q} CPPPATH=${INCL_PATH:Q} VERBOSE=1 core
-
-do-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} \
-       CC=${CC:Q} CXX=${CXX:Q} CFLAGS=${CFLAGS:Q} CXXFLAGS=${CXXFLAGS:Q} \
-       LINKFLAGS=${LDFLAGS:Q} CPPPATH=${INCL_PATH:Q} \
-       --prefix=${DESTDIR}${PREFIX} install
-
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/debian/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_DATA} ${WRKSRC}/debian/mongod.conf \
@@ -170,7 +168,9 @@ post-install:
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/scons/buildlink3.mk"
+.include "../../devel/scons4/build.mk"
+_SCONS_BUILD_ARGS=     -j${MAKE_JOBS:U1}
+_SCONS_BUILD_ARGS+=     ${SCONS_BUILD_ARGS}
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"