diff --git a/databases/mongodb44/Makefile b/databases/mongodb44/Makefile index b99f5d9e9aab..d043d3d9c4f4 100644 --- a/databases/mongodb44/Makefile +++ b/databases/mongodb44/Makefile @@ -1,83 +1,88 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 4.4.8 +DISTVERSION= 4.4.9 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 (4.4.x Branch) LICENSE= SSPLv1 APACHE20 # mongodb is SSPLv1, C++ driver is 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 PORTSCOUT= limit:^4\.4\. -CONFLICTS_INSTALL= mongodb36 mongodb4[02] +CONFLICTS_INSTALL= mongodb36 mongodb4[02] mongodb50 OPTIONS_DEFINE= LTO SASL SSL OPTIONS_DEFAULT=LTO SASL SSL OPTIONS_EXCLUDE_aarch64= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}} OPTIONS_EXCLUDE_aarch64_14= LTO # Does not work with llvm12 on aarch64. 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 && ((${OSREL:R} >= 14 && ${OSVERSION} < 1400033) \ + && ${ARCH} == "aarch64") +BROKEN= Aarch64 needs LSE atomics which was fixed in https://cgit.freebsd.org/src/commit/?id=efe67f33c322265eb303ec0ab40275100795b22a +.endif + .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le EXTRA_PATCHES= ${FILESDIR}/${ARCH} .endif ALL_TARGET= install-core 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/mongodb44/distinfo b/databases/mongodb44/distinfo index 3d2b2bc2f004..760d4d4cac1c 100644 --- a/databases/mongodb44/distinfo +++ b/databases/mongodb44/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628281136 -SHA256 (mongodb-src-r4.4.8.tar.gz) = 6f9bd6626ef61ec3cd9051ff8576bf499936de99c4fc3551f8bde4e9ba504a97 -SIZE (mongodb-src-r4.4.8.tar.gz) = 50492854 +TIMESTAMP = 1632143635 +SHA256 (mongodb-src-r4.4.9.tar.gz) = 4eee0a2213b4c455d5bc21c78a5a6a02bf33ac09e6c6bba8d5547247307a319f +SIZE (mongodb-src-r4.4.9.tar.gz) = 50541749 diff --git a/databases/mongodb44/files/patch-SConstruct b/databases/mongodb44/files/patch-SConstruct index de57cb103810..9fc72edebc07 100644 --- a/databases/mongodb44/files/patch-SConstruct +++ b/databases/mongodb44/files/patch-SConstruct @@ -1,43 +1,33 @@ --- SConstruct.orig 2021-07-07 09:17:06 UTC +++ SConstruct @@ -1213,9 +1213,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.") @@ -2091,7 +2091,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'], ) @@ -2106,7 +2106,7 @@ if env.TargetOSIs('posix'): "-Wno-unknown-pragmas", "-Winvalid-pch"] ) # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if env.TargetOSIs('linux', 'darwin', 'solaris'): + if env.TargetOSIs('linux', 'darwin', 'solaris', 'freebsd'): if not has_option("disable-warnings-as-errors"): env.Append( CCFLAGS=["-Werror"] ) -@@ -3926,7 +3926,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')