CVS commit: pkgsrc/databases/mongodb4

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jun  3 14:27:34 UTC 2024

Modified Files:
        pkgsrc/databases/mongodb4: Makefile distinfo
Added Files:
        pkgsrc/databases/mongodb4/patches:
            patch-src_third__party_boost-1.70.0_boost_asio_detail_impl_kqueue__reactor.ipp

Log Message:
databases/mongodb4: Fix build with ICU 75

* To coexist with ICU 75, use internal Boost.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/mongodb4/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mongodb4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mongodb4/patches/patch-src_third__party_boost-1.70.0_boost_asio_detail_impl_kqueue__reactor.ipp

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

Modified files:

Index: pkgsrc/databases/mongodb4/Makefile
diff -u pkgsrc/databases/mongodb4/Makefile:1.10 pkgsrc/databases/mongodb4/Makefile:1.11
--- pkgsrc/databases/mongodb4/Makefile:1.10     Wed May 29 16:31:44 2024
+++ pkgsrc/databases/mongodb4/Makefile  Mon Jun  3 14:27:34 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2024/05/29 16:31:44 adam Exp $
+# $NetBSD: Makefile,v 1.11 2024/06/03 14:27:34 ryoon Exp $
 
 DISTNAME=      mongodb-src-r4.4.28
 PKGNAME=       ${DISTNAME:S/src-r//}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    databases
 MASTER_SITES=  http://fastdl.mongodb.org/src/
 
@@ -40,7 +40,7 @@ SCONS_BUILD_ARGS+=    --release
 SCONS_BUILD_ARGS+=     --runtime-hardening=off # on: does not produce executables
 #SCONS_BUILD_ARGS+=    --use-system-abseil-cpp
 #SCONS_BUILD_ARGS+=    --use-system-asio
-SCONS_BUILD_ARGS+=     --use-system-boost
+#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
@@ -52,7 +52,7 @@ SCONS_BUILD_ARGS+=    --use-system-zlib
 SCONS_BUILD_ARGS+=     --use-system-zstd
 SCONS_BUILD_ARGS+=     --modules='' # avoid enterprise build
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  27 312
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -61,7 +61,7 @@ INCL_PATH+=   ${BUILDLINK_PREFIX.mongo-c-d
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib
 
 # needed for linking against boost_log, otherwise some symbols are not found
-SCONS_BUILD_ARGS+=     CPPDEFINES=-DBOOST_LOG_DYN_LINK=1
+#SCONS_BUILD_ARGS+=    CPPDEFINES=-DBOOST_LOG_DYN_LINK=1
 SCONS_BUILD_ARGS+=     CC=${CC:Q}
 SCONS_BUILD_ARGS+=     CXX=${CXX:Q}
 SCONS_BUILD_ARGS+=     CFLAGS=${CFLAGS:Q}
@@ -176,8 +176,8 @@ post-install:
 #.include "../../databases/wiredtiger/buildlink3.mk"
 #.include "../../devel/abseil/buildlink3.mk"
 #.include "../../devel/asio/buildlink3.mk"
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
+#.include "../../devel/boost-headers/buildlink3.mk"
+#.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/scons4/build.mk"

Index: pkgsrc/databases/mongodb4/distinfo
diff -u pkgsrc/databases/mongodb4/distinfo:1.3 pkgsrc/databases/mongodb4/distinfo:1.4
--- pkgsrc/databases/mongodb4/distinfo:1.3      Sat Jan 27 08:32:31 2024
+++ pkgsrc/databases/mongodb4/distinfo  Mon Jun  3 14:27:34 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2024/01/27 08:32:31 adam Exp $
+$NetBSD: distinfo,v 1.4 2024/06/03 14:27:34 ryoon Exp $
 
 BLAKE2s (mongodb-src-r4.4.28.tar.gz) = ab50063cd45a22178f894abb7abd4f8e08e00957419daeab2355a10685c9ec07
 SHA512 (mongodb-src-r4.4.28.tar.gz) = f2af1c64ed18dcbda63d2562993259e4dd0dea682831f9c2504f09c10c66106f564051bc2f8c6c0e908df3802f8452f1e45ba66065415a842ce4071f97c070f8
@@ -21,6 +21,7 @@ SHA1 (patch-src_mongo_util_time__support
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h) = 3c168389b9288df9055df0b01e8d26cf2f67293e
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h) = aed897879501d74b19dd06a142ded0abf910898d
 SHA1 (patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp) = 49a74ef12f20c4b243d328a2cd8317aa1a668b18
+SHA1 (patch-src_third__party_boost-1.70.0_boost_asio_detail_impl_kqueue__reactor.ipp) = 0808636a4e01f9eda921b79360ca51c04bc43230
 SHA1 (patch-src_third__party_mozjs-60_platform_x86__64_netbsd_build_js-confdefs.h) = 2474fc221f0c59381c8529e986db1f3f67c405ec
 SHA1 (patch-src_third__party_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94
 SHA1 (patch-src_third__party_wiredtiger_SConscript) = e97dea310463f246c0a8007a1ba9c5385105036d

Added files:

Index: pkgsrc/databases/mongodb4/patches/patch-src_third__party_boost-1.70.0_boost_asio_detail_impl_kqueue__reactor.ipp
diff -u /dev/null pkgsrc/databases/mongodb4/patches/patch-src_third__party_boost-1.70.0_boost_asio_detail_impl_kqueue__reactor.ipp:1.1
--- /dev/null   Mon Jun  3 14:27:34 2024
+++ pkgsrc/databases/mongodb4/patches/patch-src_third__party_boost-1.70.0_boost_asio_detail_impl_kqueue__reactor.ipp    Mon Jun  3 14:27:34 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_third__party_boost-1.70.0_boost_asio_detail_impl_kqueue__reactor.ipp,v 1.1 2024/06/03 14:27:34 ryoon Exp $
+
+* Fix static cast error under NetBSD 10.
+
+--- src/third_party/boost-1.70.0/boost/asio/detail/impl/kqueue_reactor.ipp.orig        2024-06-03 12:57:16.711672651 +0000
++++ src/third_party/boost-1.70.0/boost/asio/detail/impl/kqueue_reactor.ipp
+@@ -28,6 +28,10 @@
+ #include <boost/asio/detail/push_options.hpp>
+ 
+ #if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 999001400)
+ # define BOOST_ASIO_KQUEUE_EV_SET(ev, ident, filt, flags, fflags, data, udata) \
+     EV_SET(ev, ident, filt, flags, fflags, data, \
+       reinterpret_cast<intptr_t>(static_cast<void*>(udata)))