Attachment #226654 for bug #257394




PORTNAME=	mongodb
DISTVERSIONPREFIX=	r
DISTVERSION=	5.0.1
CATEGORIES=	databases net
MASTER_SITES=	https://fastdl.mongodb.org/src/ \
		http://fastdl.mongodb.org/src/

OPTIONS_DEFINE=	LTO SASL SSL
OPTIONS_DEFAULT=LTO SASL SSL

#.include <bsd.port.options.mk>
#
#.if ${ARCH} == aarch64 && ${OSVERSION} >= 1400000
##BUILD_DEPENDS+= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
##LLVM_VERSION=   ${LLVM_DEFAULT}
##CPP=            clang-cpp${LLVM_VERSION}
##CC=             clang${LLVM_VERSION}
##CXX=            clang++${LLVM_VERSION}
#CFLAGS+=	-mno-outline-atomics
#.endif

MAKE_ARGS=	--use-system-zlib \
		--use-system-pcre \
		--use-system-snappy \

Lines 1-3 Link Here

(-)b/databases/mongodb50/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1623670264	1	TIMESTAMP = 1626811181
2	SHA256 (mongodb-src-r5.0.0-rc1.tar.gz) = 17b4998385e82855bb6a17056ae75e1811c2784c14b6ba89706f0ad17f5279dc	2	SHA256 (mongodb-src-r5.0.1.tar.gz) = 141c9a6b538e121b2d69e26b9b3e7308f24dff9c7c238190233204a2ebe39b83
3	SIZE (mongodb-src-r5.0.0-rc1.tar.gz) = 54409236	3	SIZE (mongodb-src-r5.0.1.tar.gz) = 54468206




--- SConstruct.orig	2021-07-15 20:56:31 UTC
+++ SConstruct
@@ -1328,9 +1328,9 @@ if has_option('variables-help'):
     print(env_vars.GenerateHelpText(env))
     Exit(0)
 

 
 if get_option('install-action') != 'default' and get_option('ninja') != "disabled":
     env.FatalError("Cannot use non-default install actions when generating Ninja.")
@@ -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(

                 PROGLINKFLAGS=['-pie'],
             )
 
@@ -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.
 

         "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')

Return to bug 257394

Lines 1-6 Link Here

(-)b/databases/mongodb50/Makefile (-1 / +12 lines)
1	PORTNAME= mongodb	1	PORTNAME= mongodb
2	DISTVERSIONPREFIX= r	2	DISTVERSIONPREFIX= r
3	DISTVERSION= 5.0.0-rc1	3	DISTVERSION= 5.0.1
4	CATEGORIES= databases net	4	CATEGORIES= databases net
5	MASTER_SITES= https://fastdl.mongodb.org/src/ \	5	MASTER_SITES= https://fastdl.mongodb.org/src/ \
6	http://fastdl.mongodb.org/src/	6	http://fastdl.mongodb.org/src/
Lines 36-41 CONFLICTS_INSTALL= mongodb36 mongodb4[024] Link Here
36	OPTIONS_DEFINE= LTO SASL SSL	36	OPTIONS_DEFINE= LTO SASL SSL
37	OPTIONS_DEFAULT=LTO SASL SSL	37	OPTIONS_DEFAULT=LTO SASL SSL
38		38
		39	#.include <bsd.port.options.mk>
		40	#
		41	#.if ${ARCH} == aarch64 && ${OSVERSION} >= 1400000
		42	##BUILD_DEPENDS+= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
		43	##LLVM_VERSION= ${LLVM_DEFAULT}
		44	##CPP= clang-cpp${LLVM_VERSION}
		45	##CC= clang${LLVM_VERSION}
		46	##CXX= clang++${LLVM_VERSION}
		47	#CFLAGS+= -mno-outline-atomics
		48	#.endif
		49
39	MAKE_ARGS= --use-system-zlib \	50	MAKE_ARGS= --use-system-zlib \
40	--use-system-pcre \	51	--use-system-pcre \
41	--use-system-snappy \	52	--use-system-snappy \

Lines 1-6 Link Here

(-)b/databases/mongodb50/files/patch-SConstruct (-4 / +14 lines)
1	--- SConstruct.orig 2021-04-29 23:06:52 UTC	1	--- SConstruct.orig 2021-07-15 20:56:31 UTC
2	+++ SConstruct	2	+++ SConstruct
3	@@ -1324,9 +1324,9 @@ if has_option('variables-help'):	3	@@ -1328,9 +1328,9 @@ if has_option('variables-help'):
4	print(env_vars.GenerateHelpText(env))	4	print(env_vars.GenerateHelpText(env))
5	Exit(0)	5	Exit(0)
6		6
Lines 13-19 Link Here
13		13
14	if get_option('install-action') != 'default' and get_option('ninja') != "disabled":	14	if get_option('install-action') != 'default' and get_option('ninja') != "disabled":
15	env.FatalError("Cannot use non-default install actions when generating Ninja.")	15	env.FatalError("Cannot use non-default install actions when generating Ninja.")
16	@@ -2498,7 +2498,7 @@ if env.TargetOSIs('posix'):	16	@@ -2507,7 +2507,7 @@ if env.TargetOSIs('posix'):
17	# If runtime hardening is requested, then build anything	17	# If runtime hardening is requested, then build anything
18	# destined for an executable with the necessary flags for PIE.	18	# destined for an executable with the necessary flags for PIE.
19	env.AppendUnique(	19	env.AppendUnique(
Lines 22-28 Link Here
22	PROGLINKFLAGS=['-pie'],	22	PROGLINKFLAGS=['-pie'],
23	)	23	)
24		24
25	@@ -2675,8 +2675,12 @@ if not env.TargetOSIs('windows') and (env.ToolchainIs(	25	@@ -2684,8 +2684,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
26	# setting it for both C and C++ by setting both of CFLAGS and	26	# setting it for both C and C++ by setting both of CFLAGS and
27	# CXXFLAGS.	27	# CXXFLAGS.
28		28
Lines 36-38 Link Here
36	"i386" : { "-march=" : "nocona", "-mtune=" : "generic" },	36	"i386" : { "-march=" : "nocona", "-mtune=" : "generic" },
37	"ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" },	37	"ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" },
38	"s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" },	38	"s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" },
		39	@@ -4520,7 +4524,8 @@ def doConfigure(myenv):
		40	myenv = conf.Finish()
		41
		42	if env['TARGET_ARCH'] == "aarch64":
		43	- AddToCCFLAGSIfSupported(myenv, "-moutline-atomics")
		44	+ # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html
		45	+ AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics")
		46
		47	conf = Configure(myenv)
		48	usdt_enabled = get_option('enable-usdt-probes')