pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/databases/mongodb mongodb: catch up with scons update



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7aa5a8a058c9
branches:  trunk
changeset: 317244:7aa5a8a058c9
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Jan 02 20:25:00 2019 +0000

description:
mongodb: catch up with scons update

diffstat:

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

diffs (52 lines):

diff -r b80b1b425b3b -r 7aa5a8a058c9 databases/mongodb/Makefile
--- a/databases/mongodb/Makefile        Wed Jan 02 20:24:33 2019 +0000
+++ b/databases/mongodb/Makefile        Wed Jan 02 20:25:00 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2018/12/13 19:51:44 adam Exp $
+# $NetBSD: Makefile,v 1.32 2019/01/02 20:25:00 tnn Exp $
 
 DISTNAME=      mongodb-src-r3.4.4
 PKGNAME=       ${DISTNAME:S/src-r//:S/-rc/rc/}
@@ -19,9 +19,6 @@
 NO_CONFIGURE=  yes
 USE_LANGUAGES= c c++
 
-BUILD_DEPENDS+=        scons-[0-9]*:../../devel/scons
-
-SCONS_BIN=     ${PREFIX}/bin/scons
 SCONS_ARGS=    ${_MAKE_JOBS}
 SCONS_ARGS+=   --use-system-boost
 SCONS_ARGS+=   --use-system-pcre
@@ -36,6 +33,11 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+# XXX this doesn't work for some reason
+#.if !empty(INSTALL_UNSTRIPPED:Uno:M[Yy][Ee][Ss])
+#SCONS_ARGS+=  --nostrip
+#.endif
+
 GCC_REQD+=     5.3.0
 
 CPPFLAGS+=     -fno-jump-tables
@@ -111,10 +113,10 @@
                ${WRKSRC}/src/mongo/db/ftdc/ftdc_system_stats_netbsd.cpp
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS_BIN} ${SCONS_ARGS} core
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} core
 
 do-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS_BIN} ${SCONS_ARGS} \
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} \
                --prefix=${DESTDIR}${PREFIX} install
 
 do-test:
@@ -134,6 +136,7 @@
 .include "../../devel/py-boost/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/scons/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"



Home | Main Index | Thread Index | Old Index