pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/databases/mongodb databases/mongodb: Use system icu



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d34f7186966
branches:  trunk
changeset: 397505:5d34f7186966
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Jun 27 01:02:22 2019 +0000

description:
databases/mongodb: Use system icu

This package had been configured to use mongodb's bundled icu, but
something in the dependencies brought in icu anyway, and there were
type conflicts between pkgsrc and bundled.  Apparently whatever was
trouble in earlier mongodb has been fixed, as the build gets much
further with "system" (pkgsrc) icu.

diffstat:

 databases/mongodb/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r efef1f97c3f8 -r 5d34f7186966 databases/mongodb/Makefile
--- a/databases/mongodb/Makefile        Thu Jun 27 00:58:54 2019 +0000
+++ b/databases/mongodb/Makefile        Thu Jun 27 01:02:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/06/27 00:58:54 gdt Exp $
+# $NetBSD: Makefile,v 1.39 2019/06/27 01:02:22 gdt Exp $
 
 DISTNAME=      mongodb-src-r4.0.6
 PKGNAME=       ${DISTNAME:S/src-r//}
@@ -34,7 +34,7 @@
 SCONS_ARGS+=   --runtime-hardening=off # does not produce executables
 #SCONS_ARGS+=  --use-system-asio
 SCONS_ARGS+=   --use-system-boost
-#SCONS_ARGS+=  --use-system-icu # fails with >57.1
+SCONS_ARGS+=   --use-system-icu
 SCONS_ARGS+=   --use-system-mongo-c
 SCONS_ARGS+=   --use-system-pcre
 SCONS_ARGS+=   --use-system-snappy
@@ -173,7 +173,7 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../net/libpcap/buildlink3.mk"
-#.include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index