Index: branches/2017Q4/databases/mongodb34/Makefile =================================================================== --- branches/2017Q4/databases/mongodb34/Makefile (revision 451235) +++ branches/2017Q4/databases/mongodb34/Makefile (revision 451236) @@ -1,78 +1,78 @@ # $FreeBSD$ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 3.4.6 -PORTREVISION= 3 +DISTVERSION= 3.4.7 +PORTREVISION= 1 CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ http://fastdl.mongodb.org/src/ \ http://download.mongodb.org/src/ PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION} MAINTAINER= eric@camachat.org COMMENT= Distributed document-oriented "NoSQL" database # mongodb is AGPLv3, C++ driver is APACHE20 LICENSE= AGPLv3 APACHE20 LICENSE_COMB= multi ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)" LIB_DEPENDS= libpcre.so:devel/pcre \ libsnappy.so:archivers/snappy \ libboost_system.so:devel/boost-libs TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo CONFLICTS_BUILD= mongo-cxx-driver CHOSEN_COMPILER_TYPE= clang USES= compiler:c++14-lang cpe python:build scons USE_RC_SUBR= mongod MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \ --use-system-pcre --use-system-snappy \ --use-system-boost --use-system-zlib \ --cxx-std=14 --libc++ \ --runtime-hardening=on \ --disable-warnings-as-errors \ VERBOSE=on WITH_DEBUG= yes USERS= mongodb GROUPS= mongodb OPTIONS_DEFINE= SASL SSL OPTIONS_DEFAULT= SASL SSL SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client SSL_USES= ssl SSL_MAKE_ARGS= --ssl ALL_TARGET= core TEST_TARGET= unittests PORTSCOUT= limitw:1,even CPE_PRODUCT= mongodb post-install: .for f in mongo mongod mongoperf mongos ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor ${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample do-test: @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET} &&\ ${PYTHON_CMD} ${BUILD_WRKSRC}/buildscripts/resmoke.py\ --suites=unittests --jobs=${MAKE_JOBS_NUMBER} .include Index: branches/2017Q4/databases/mongodb34/distinfo =================================================================== --- branches/2017Q4/databases/mongodb34/distinfo (revision 451235) +++ branches/2017Q4/databases/mongodb34/distinfo (revision 451236) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499359915 -SHA256 (mongodb-src-r3.4.6.tar.gz) = 8170360f6dfede9c19c131f3d76831e952b3f1494925aa7e2a3a2f95b58ad901 -SIZE (mongodb-src-r3.4.6.tar.gz) = 39922209 +TIMESTAMP = 1504811876 +SHA256 (mongodb-src-r3.4.7.tar.gz) = 9272e7663c7915e09ad2609e28c58437d760d54a9552c711ea735cd8e1784ec0 +SIZE (mongodb-src-r3.4.7.tar.gz) = 39936247 Index: branches/2017Q4/databases/mongodb34/files/patch-SConstruct =================================================================== --- branches/2017Q4/databases/mongodb34/files/patch-SConstruct (revision 451235) +++ branches/2017Q4/databases/mongodb34/files/patch-SConstruct (revision 451236) @@ -1,80 +1,72 @@ --- SConstruct.orig 2017-06-08 16:11:03 UTC +++ SConstruct @@ -929,9 +929,9 @@ if has_option('variables-help'): print env_vars.GenerateHelpText(env) Exit(0) -unknown_vars = env_vars.UnknownVariables() -if unknown_vars: - env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) +#unknown_vars = env_vars.UnknownVariables() +#if unknown_vars: +# env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) def set_config_header_define(env, varname, varval = 1): env['CONFIG_HEADER_DEFINES'][varname] = varval @@ -1550,7 +1550,7 @@ if env.TargetOSIs('posix'): # If runtime hardening is requested, then build anything # destined for an executable with the necessary flags for PIE. env.AppendUnique( - PROGCCFLAGS=['-fPIE'], + PROGCCFLAGS=['-fpic'], PROGLINKFLAGS=['-pie'], ) @@ -1564,7 +1564,7 @@ if env.TargetOSIs('posix'): "-Wno-unknown-pragmas", "-Winvalid-pch"] ) # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if env.TargetOSIs('linux', 'osx', 'solaris'): + if env.TargetOSIs('linux', 'osx', 'solaris', 'freebsd'): if not has_option("disable-warnings-as-errors"): env.Append( CCFLAGS=["-Werror"] ) @@ -1592,19 +1592,19 @@ if env.TargetOSIs('posix'): env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) - if optBuild: - env.Append( CCFLAGS=["-O2"] ) - else: - env.Append( CCFLAGS=["-O0"] ) + #if optBuild: + # env.Append( CCFLAGS=["-O2"] ) + #else: + # env.Append( CCFLAGS=["-O0"] ) # Promote linker warnings into errors. We can't yet do this on OS X because its linker considers # noall_load obsolete and warns about it. - if not env.TargetOSIs('osx'): - env.Append( - LINKFLAGS=[ - "-Wl,--fatal-warnings", - ], - ) + #if not env.TargetOSIs('osx'): + # env.Append( + # LINKFLAGS=[ + # "-Wl,--fatal-warnings", + # ], + # ) mmapv1 = False if get_option('mmapv1') == 'auto': @@ -2461,7 +2461,7 @@ def doConfigure(myenv): }} """.format(storage_class) context.Message('Checking for storage class {0} '.format(storage_class)) - ret = context.TryLink(textwrap.dedent(test_body), ".cpp") + ret = context.TryCompile(textwrap.dedent(test_body), ".cpp") context.Result(ret) return ret -@@ -2645,6 +2645,7 @@ def doConfigure(myenv): - - conf = Configure(myenv, custom_tests = { - 'CheckPThreadSetNameNP': CheckPThreadSetNameNP, -+ 'CheckBoostMinVersion': CheckBoostMinVersion, - }) - - if conf.CheckPThreadSetNameNP(): Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 451235) +++ branches/2017Q4 (revision 451236) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r451129