Attachment #223673 for bug #254631

Lines 198-203 Link Here

(-)Makefile (+1 lines)
198	SUBDIR += mongodb42	198	SUBDIR += mongodb42
199	SUBDIR += mongodb42-tools	199	SUBDIR += mongodb42-tools
200	SUBDIR += mongodb44	200	SUBDIR += mongodb44
		201	SUBDIR += mongodb49
201	SUBDIR += mroonga	202	SUBDIR += mroonga
202	SUBDIR += mtop	203	SUBDIR += mtop
203	SUBDIR += mydumper	204	SUBDIR += mydumper

Lines 2-8 Link Here

(-)mongodb49/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= mongodb	3	PORTNAME= mongodb
4	DISTVERSIONPREFIX= r	4	DISTVERSIONPREFIX= r
5	DISTVERSION= 4.4.4	5	DISTVERSION= 4.9.0-rc0
6	CATEGORIES= databases net	6	CATEGORIES= databases net
7	MASTER_SITES= https://fastdl.mongodb.org/src/ \	7	MASTER_SITES= https://fastdl.mongodb.org/src/ \
8	http://fastdl.mongodb.org/src/	8	http://fastdl.mongodb.org/src/
Lines 10-16 Link Here
10	DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}	10	DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
11		11
12	MAINTAINER= ronald-lists@klop.ws	12	MAINTAINER= ronald-lists@klop.ws
13	COMMENT= Distributed document-oriented "NoSQL" database (4.4.x Branch)	13	COMMENT= Distributed document-oriented "NoSQL" database (4.9.x Branch)
14		14
15	# mongodb is SSPLv1, C++ driver is APACHE20	15	# mongodb is SSPLv1, C++ driver is APACHE20
16	LICENSE= SSPLv1 APACHE20	16	LICENSE= SSPLv1 APACHE20

Lines 1-3 Link Here

(-)mongodb49/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1613588488	1	TIMESTAMP = 1616770797
2	SHA256 (mongodb-src-r4.4.4.tar.gz) = 33b15c80c61800a7bb73999159dfff374ba4fcc0b56b9949c81ff5e411a76956	2	SHA256 (mongodb-src-r4.9.0-rc0.tar.gz) = ebe45ce5eedacc1bac2b6652aa377892000123a259d0f71280b5f512b5966a1d
3	SIZE (mongodb-src-r4.4.4.tar.gz) = 49942905	3	SIZE (mongodb-src-r4.9.0-rc0.tar.gz) = 52333345




--- SConstruct.orig	2021-03-23 15:33:12 UTC
+++ SConstruct
@@ -1261,9 +1261,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())))
 
 if get_option('install-action') != 'default' and get_option('ninja') != "disabled":
     env.FatalError("Cannot use non-default install actions when generating Ninja.")
@@ -2419,7 +2419,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'],
             )
 
@@ -2433,7 +2433,7 @@ if env.TargetOSIs('posix'):
                          "-Wno-unknown-pragmas",
                          "-Winvalid-pch"] )
     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet




--- src/mongo/platform/process_id.cpp.orig	2021-03-26 23:29:14 UTC
+++ src/mongo/platform/process_id.cpp
@@ -35,6 +35,10 @@
 #include <pthread.h>
 #endif
 
+#if defined(__FreeBSD__)
+#include <pthread_np.h>
+#endif
+
 #if defined(__linux__)
 #include <sys/syscall.h>
 #include <sys/types.h>
@@ -72,6 +76,10 @@ inline NativeProcessId getCurrentNativeThreadId() {
     uint64_t tid;
     invariant(::pthread_threadid_np(NULL, &tid) == 0);
     return tid;
+}
+#elif __FreeBSD__
+inline NativeProcessId getCurrentNativeThreadId() {
+    return pthread_getthreadid_np();
 }
 #else
 inline NativeProcessId getCurrentNativeThreadId() {

Lines 2-5 Link Here

(-)mongodb49/pkg-descr (-1 / +1 lines)
2	schema-free, document-oriented database. A common name in the	2	schema-free, document-oriented database. A common name in the
3	"NOSQL" community.	3	"NOSQL" community.
4		4
5	WWW: https://docs.mongodb.com/v4.4/	5	WWW: https://docs.mongodb.com/v4.9/

Return to bug 254631

Lines 1-7 Link Here

(-)mongodb49/files/patch-SConstruct (-7 / +7 lines)
1	--- SConstruct.orig 2019-08-08 20:06:23 UTC	1	--- SConstruct.orig 2021-03-23 15:33:12 UTC
2	+++ SConstruct	2	+++ SConstruct
3	@@ -1068,9 +1068,9 @@ if has_option('variables-help'):	3	@@ -1261,9 +1261,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
7	-unknown_vars = env_vars.UnknownVariables()	7	-unknown_vars = env_vars.UnknownVariables()
Lines 11-19 Link Here
11	+#if unknown_vars:	11	+#if unknown_vars:
12	+# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))	12	+# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
13		13
14	def set_config_header_define(env, varname, varval = 1):	14	if get_option('install-action') != 'default' and get_option('ninja') != "disabled":
15	env['CONFIG_HEADER_DEFINES'][varname] = varval	15	env.FatalError("Cannot use non-default install actions when generating Ninja.")
16	@@ -1851,7 +1851,7 @@ if env.TargetOSIs('posix'):	16	@@ -2419,7 +2419,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	@@ -1865,7 +1865,7 @@ if env.TargetOSIs('posix'):	25	@@ -2433,7 +2433,7 @@ if env.TargetOSIs('posix'):
26	"-Wno-unknown-pragmas",	26	"-Wno-unknown-pragmas",
27	"-Winvalid-pch"] )	27	"-Winvalid-pch"] )
28	# env.Append( " -Wconversion" ) TODO: this doesn't really work yet	28	# env.Append( " -Wconversion" ) TODO: this doesn't really work yet

Line 0 Link Here

(-)mongodb49/files/patch-src_mongo_platform_process__id.cpp (+24 lines)
	1	--- src/mongo/platform/process_id.cpp.orig 2021-03-26 23:29:14 UTC
	2	+++ src/mongo/platform/process_id.cpp
	3	@@ -35,6 +35,10 @@
	4	#include <pthread.h>
	5	#endif
	6
	7	+#if defined(__FreeBSD__)
	8	+#include <pthread_np.h>
	9	+#endif
	10	+
	11	#if defined(__linux__)
	12	#include <sys/syscall.h>
	13	#include <sys/types.h>
	14	@@ -72,6 +76,10 @@ inline NativeProcessId getCurrentNativeThreadId() {
	15	uint64_t tid;
	16	invariant(::pthread_threadid_np(NULL, &tid) == 0);
	17	return tid;
	18	+}
	19	+#elif __FreeBSD__
	20	+inline NativeProcessId getCurrentNativeThreadId() {
	21	+ return pthread_getthreadid_np();
	22	}
	23	#else
	24	inline NativeProcessId getCurrentNativeThreadId() {