diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile index 81773174a4a4..a7d843bf4e66 100644 --- a/databases/mongodb50/Makefile +++ b/databases/mongodb50/Makefile @@ -1,88 +1,88 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 5.0.0-rc1 +DISTVERSION= 5.0.1 CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ http://fastdl.mongodb.org/src/ PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION} MAINTAINER= ronald-lists@klop.ws COMMENT= Distributed document-oriented "NoSQL" database (5.0.x Branch) # mongodb is SSPLv1, C++ driver is APACHE20 LICENSE= SSPLv1 APACHE20 LICENSE_COMB= multi LICENSE_NAME_SSPLv1= Server Side Public License Version 1 LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE-Community.txt LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le ONLY_FOR_ARCHS_REASON= Only ported to amd64, aarch64 and powerpc64le on FreeBSD. Upstream supports arm64, ppc64le, s390x and x86-64. BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${LOCALBASE}/bin/ar:devel/binutils LIB_DEPENDS= libpcre.so:devel/pcre \ libcurl.so:ftp/curl \ libsnappy.so:archivers/snappy USES= compiler:c++17-lang cpe python:3.5+,build scons USE_RC_SUBR= mongod CONFLICTS_INSTALL= mongodb36 mongodb4[024] OPTIONS_DEFINE= LTO SASL SSL OPTIONS_DEFAULT=LTO SASL SSL MAKE_ARGS= --use-system-zlib \ --use-system-pcre \ --use-system-snappy \ --libc++ \ --cxx-std=17 \ --runtime-hardening=on \ -j ${MAKE_JOBS_NUMBER} \ --disable-warnings-as-errors \ VERBOSE=on \ AR=${PREFIX}/bin/ar USERS= mongodb GROUPS= mongodb LTO_MAKE_ARGS= --lto=on SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client SSL_USES= ssl SSL_MAKE_ARGS= --ssl .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le EXTRA_PATCHES= ${FILESDIR}/${ARCH} .endif ALL_TARGET= install-core PORTSCOUT= limitw:1,even CPE_PRODUCT= mongodb pre-patch: ${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S do-install: .for f in mongo mongod mongos ${INSTALL_PROGRAM} ${WRKSRC}/build/install${PREFIX}/bin/${f} ${STAGEDIR}${PREFIX}/bin .endfor ${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample .include diff --git a/databases/mongodb50/distinfo b/databases/mongodb50/distinfo index 9c502acdda63..9d5edc8bf07a 100644 --- a/databases/mongodb50/distinfo +++ b/databases/mongodb50/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623670264 -SHA256 (mongodb-src-r5.0.0-rc1.tar.gz) = 17b4998385e82855bb6a17056ae75e1811c2784c14b6ba89706f0ad17f5279dc -SIZE (mongodb-src-r5.0.0-rc1.tar.gz) = 54409236 +TIMESTAMP = 1626811181 +SHA256 (mongodb-src-r5.0.1.tar.gz) = 141c9a6b538e121b2d69e26b9b3e7308f24dff9c7c238190233204a2ebe39b83 +SIZE (mongodb-src-r5.0.1.tar.gz) = 54468206 diff --git a/databases/mongodb50/files/patch-SConstruct b/databases/mongodb50/files/patch-SConstruct index 3d7a6ad73feb..c798505de87a 100644 --- a/databases/mongodb50/files/patch-SConstruct +++ b/databases/mongodb50/files/patch-SConstruct @@ -1,38 +1,48 @@ ---- SConstruct.orig 2021-04-29 23:06:52 UTC +--- SConstruct.orig 2021-07-15 20:56:31 UTC +++ SConstruct -@@ -1324,9 +1324,9 @@ if has_option('variables-help'): +@@ -1328,9 +1328,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(list(unknown_vars.keys()))) +#unknown_vars = env_vars.UnknownVariables() +#if unknown_vars: +# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) if get_option('install-action') != 'default' and get_option('ninja') != "disabled": env.FatalError("Cannot use non-default install actions when generating Ninja.") -@@ -2498,7 +2498,7 @@ if env.TargetOSIs('posix'): +@@ -2507,7 +2507,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'], ) -@@ -2675,8 +2675,12 @@ if not env.TargetOSIs('windows') and (env.ToolchainIs( +@@ -2684,8 +2684,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too # setting it for both C and C++ by setting both of CFLAGS and # CXXFLAGS. + arm_march_flag = "armv8-a" + if get_option('use-hardware-crc32') == "on": + arm_march_flag += "+crc" + default_targeting_flags_for_architecture = { - "aarch64" : { "-march=" : "armv8.2-a", "-mtune=" : "generic" }, + "aarch64" : { "-march=" : arm_march_flag, "-mtune=" : "generic" }, "i386" : { "-march=" : "nocona", "-mtune=" : "generic" }, "ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" }, "s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" }, +@@ -4520,7 +4524,8 @@ def doConfigure(myenv): + myenv = conf.Finish() + + if env['TARGET_ARCH'] == "aarch64": +- AddToCCFLAGSIfSupported(myenv, "-moutline-atomics") ++ # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html ++ AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics") + + conf = Configure(myenv) + usdt_enabled = get_option('enable-usdt-probes')