pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/databases/mongodb



Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jun  3 14:25:24 UTC 2024

Modified Files:
        pkgsrc/databases/mongodb: Makefile

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

* To coexist with ICU 75, use internal Boost.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 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.89 pkgsrc/databases/mongodb/Makefile:1.90
--- pkgsrc/databases/mongodb/Makefile:1.89      Wed May 29 16:31:43 2024
+++ pkgsrc/databases/mongodb/Makefile   Mon Jun  3 14:25:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2024/05/29 16:31:43 adam Exp $
+# $NetBSD: Makefile,v 1.90 2024/06/03 14:25:24 ryoon Exp $
 
 DISTNAME=      mongodb-src-r6.0.13
 PKGNAME=       ${DISTNAME:S/src-r//}
@@ -40,7 +40,7 @@ SCONS_BUILD_ARGS+=    --disable-warnings-as
 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-boost
 #SCONS_BUILD_ARGS+=    --use-system-fmt
 SCONS_BUILD_ARGS+=     --use-system-icu
 SCONS_BUILD_ARGS+=     --use-system-mongo-c
@@ -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}
@@ -175,8 +175,8 @@ post-install:
 .include "../../databases/mongo-c-driver/buildlink3.mk"
 #.include "../../databases/wiredtiger/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"



Home | Main Index | Thread Index | Old Index