Attachment #235682 for bug #265210

View | Details | Raw Unified | Return to bug 265210
Collapse All | Expand All

Lines 23-31 BUILD_DEPENDS= ${LOCALBASE}/bin/ar:devel/binutils \ Link Here

(-)b/databases/mongodb50/Makefile (-2 / +21 lines)
23	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}	25	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
26	LIB_DEPENDS= libcurl.so:ftp/curl \	26	LIB_DEPENDS= libboost_log.so:devel/boost-libs \
		27	libcurl.so:ftp/curl \
27	libpcre.so:devel/pcre \	28	libpcre.so:devel/pcre \
28	libsnappy.so:archivers/snappy	29	libsnappy.so:archivers/snappy \
		30	libstemmer.so:textproc/snowballstemmer \
		31	libunwind.so:devel/libunwind \
		32	libyaml-cpp.so:devel/yaml-cpp \
		33	libzstd.so:archivers/zstd
29		34
30	USES= compiler:c++17-lang cpe python:3.5+,build scons shebangfix	35	USES= compiler:c++17-lang cpe python:3.5+,build scons shebangfix
31	USE_RC_SUBR= mongod	36	USE_RC_SUBR= mongod
Lines 37-45 MAKE_ARGS= --cxx-std=17 \ Link Here
37	--disable-warnings-as-errors \	42	--disable-warnings-as-errors \
38	--libc++ \	43	--libc++ \
39	--runtime-hardening=on \	44	--runtime-hardening=on \
		45	--use-system-boost \
40	--use-system-pcre \	46	--use-system-pcre \
41	--use-system-snappy \	47	--use-system-snappy \
		48	--use-system-stemmer \
		49	--use-system-libunwind \
		50	--use-system-yaml \
42	--use-system-zlib \	51	--use-system-zlib \
		52	--use-system-zstd \
43	-j ${MAKE_JOBS_NUMBER} \	53	-j ${MAKE_JOBS_NUMBER} \
44	AR=${PREFIX}/bin/ar \	54	AR=${PREFIX}/bin/ar \
45	VERBOSE=on	55	VERBOSE=on
Lines 79-84 CPE_PRODUCT= mongodb Link Here
79	pre-patch:	89	pre-patch:
80	${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S	90	${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S
81		91
		92	post-patch:
		93	${RM} -rf ${WRKSRC}/src/third_party/boost
		94	${RM} -rf ${WRKSRC}/src/third_party/pcre-*
		95	${RM} -rf ${WRKSRC}/src/third_party/snappy-*
		96	${RM} -rf ${WRKSRC}/src/third_party/unwind
		97	${RM} -rf ${WRKSRC}/src/third_party/yaml-cpp
		98	${RM} -rf ${WRKSRC}/src/third_party/zlib-*
		99	${RM} -rf ${WRKSRC}/src/third_party/zstandard-*
		100
82	do-build:	101	do-build:
83	${WRKSRC}/buildscripts/scons.py -C ${WRKSRC} ${MAKE_ARGS}	102	${WRKSRC}/buildscripts/scons.py -C ${WRKSRC} ${MAKE_ARGS}
84		103




         "i386"       : { "-march=" : "nocona",       "-mtune=" : "generic"                        },
         "ppc64le"    : { "-mcpu="  : "power8",       "-mtune=" : "power8", "-mcmodel=" : "medium" },
         "s390x"      : { "-march=" : "z196",         "-mtune=" : "zEC12"                          },
@@ -2554,7 +2558,7 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
     if "sandybridge" in selected_experimental_optimizations:
         default_targeting_flags_for_architecture["x86_64"] = {
             "-march="                : "sandybridge",
-            "-mtune="                : "generic",
+    #       "-mtune="                : "generic",
             "-mprefer-vector-width=" : "128",
         }
 




--- src/mongo/db/auth/security_key_test.cpp
+++ src/mongo/db/auth/security_key_test.cpp
@@ -30,6 +30,7 @@
 #include "mongo/platform/basic.h"
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 #include "mongo/base/string_data.h"
 #include "mongo/db/auth/authorization_manager.h"
--- src/mongo/db/storage/storage_repair_observer.cpp
+++ src/mongo/db/storage/storage_repair_observer.cpp
@@ -41,6 +41,7 @@
 #include <sys/types.h>
 #endif
 
+#include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/path.hpp>
 
 #include "mongo/db/dbhelpers.h"
--- src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
+++ src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
@@ -34,6 +34,7 @@
 #include "mongo/db/storage/kv/kv_engine_test_harness.h"
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/path.hpp>
 #include <memory>
 
--- src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+++ src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
@@ -36,6 +36,7 @@
 #include <limits>
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/path.hpp>
 
 #include "mongo/base/simple_string_data_comparator.h"
--- src/mongo/shell/shell_utils_extended.cpp
+++ src/mongo/shell/shell_utils_extended.cpp
@@ -37,6 +37,7 @@
 #endif
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <fmt/format.h>
 #include <fstream>
 
--- src/mongo/util/stacktrace_threads.cpp
+++ src/mongo/util/stacktrace_threads.cpp
@@ -36,6 +36,7 @@
 #include <array>
 #include <atomic>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <cstdint>
 #include <cstdlib>
 #include <dirent.h>
--- src/mongo/util/processinfo_linux.cpp
+++ src/mongo/util/processinfo_linux.cpp
@@ -36,6 +36,7 @@
 #include <iostream>
 #include <malloc.h>
 #include <pcrecpp.h>
+#include <fstream>
 #include <sched.h>
 #include <stdio.h>
 #include <sys/mman.h>




--- SConstruct
+++ SConstruct
@@ -3511,17 +3511,11 @@ def doConfigure(myenv):
             "BOOST_LOG_NO_SHORTHAND_NAMES",
             "BOOST_LOG_USE_NATIVE_SYSLOG",
             "BOOST_LOG_WITHOUT_THREAD_ATTR",
+            "BOOST_LOG_DYN_LINK",
             "ABSL_FORCE_ALIGNED_ACCESS",
         ]
     )
 
-    if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
-        conf.env.AppendUnique(
-            CPPDEFINES=[
-                "BOOST_LOG_DYN_LINK",
-            ]
-    )
-
     if use_system_version_of_library("boost"):
         if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
             myenv.ConfError("can't find boost headers")

Return to bug 265210

Lines 43-45 Link Here

(-)b/databases/mongodb50/files/patch-SConstruct (+9 lines)
43	"i386" : { "-march=" : "nocona", "-mtune=" : "generic" },	43	"i386" : { "-march=" : "nocona", "-mtune=" : "generic" },
44	"ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" },	44	"ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" },
45	"s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" },	45	"s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" },
		46	@@ -2554,7 +2558,7 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
		47	if "sandybridge" in selected_experimental_optimizations:
		48	default_targeting_flags_for_architecture["x86_64"] = {
		49	"-march=" : "sandybridge",
		50	- "-mtune=" : "generic",
		51	+ # "-mtune=" : "generic",
		52	"-mprefer-vector-width=" : "128",
		53	}
		54

Added Link Here

(-)b/databases/mongodb50/files/patch-boost-179-compat (+70 lines)
1	--- src/mongo/db/auth/security_key_test.cpp
2	+++ src/mongo/db/auth/security_key_test.cpp
3	@@ -30,6 +30,7 @@
4	#include "mongo/platform/basic.h"
5
6	#include <boost/filesystem.hpp>
7	+#include <boost/filesystem/fstream.hpp>
8
9	#include "mongo/base/string_data.h"
10	#include "mongo/db/auth/authorization_manager.h"
11	--- src/mongo/db/storage/storage_repair_observer.cpp
12	+++ src/mongo/db/storage/storage_repair_observer.cpp
13	@@ -41,6 +41,7 @@
14	#include <sys/types.h>
15	#endif
16
17	+#include <boost/filesystem/fstream.hpp>
18	#include <boost/filesystem/path.hpp>
19
20	#include "mongo/db/dbhelpers.h"
21	--- src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
22	+++ src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
23	@@ -34,6 +34,7 @@
24	#include "mongo/db/storage/kv/kv_engine_test_harness.h"
25
26	#include <boost/filesystem.hpp>
27	+#include <boost/filesystem/fstream.hpp>
28	#include <boost/filesystem/path.hpp>
29	#include <memory>
30
31	--- src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
32	+++ src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
33	@@ -36,6 +36,7 @@
34	#include <limits>
35
36	#include <boost/filesystem.hpp>
37	+#include <boost/filesystem/fstream.hpp>
38	#include <boost/filesystem/path.hpp>
39
40	#include "mongo/base/simple_string_data_comparator.h"
41	--- src/mongo/shell/shell_utils_extended.cpp
42	+++ src/mongo/shell/shell_utils_extended.cpp
43	@@ -37,6 +37,7 @@
44	#endif
45
46	#include <boost/filesystem.hpp>
47	+#include <boost/filesystem/fstream.hpp>
48	#include <fmt/format.h>
49	#include <fstream>
50
51	--- src/mongo/util/stacktrace_threads.cpp
52	+++ src/mongo/util/stacktrace_threads.cpp
53	@@ -36,6 +36,7 @@
54	#include <array>
55	#include <atomic>
56	#include <boost/filesystem.hpp>
57	+#include <boost/filesystem/fstream.hpp>
58	#include <cstdint>
59	#include <cstdlib>
60	#include <dirent.h>
61	--- src/mongo/util/processinfo_linux.cpp
62	+++ src/mongo/util/processinfo_linux.cpp
63	@@ -36,6 +36,7 @@
64	#include <iostream>
65	#include <malloc.h>
66	#include <pcrecpp.h>
67	+#include <fstream>
68	#include <sched.h>
69	#include <stdio.h>
70	#include <sys/mman.h>

Added Link Here

(-)b/databases/mongodb50/files/patch-boost-179-link-fix (+21 lines)
1	--- SConstruct
2	+++ SConstruct
3	@@ -3511,17 +3511,11 @@ def doConfigure(myenv):
4	"BOOST_LOG_NO_SHORTHAND_NAMES",
5	"BOOST_LOG_USE_NATIVE_SYSLOG",
6	"BOOST_LOG_WITHOUT_THREAD_ATTR",
7	+ "BOOST_LOG_DYN_LINK",
8	"ABSL_FORCE_ALIGNED_ACCESS",
9	]
10	)
11
12	- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
13	- conf.env.AppendUnique(
14	- CPPDEFINES=[
15	- "BOOST_LOG_DYN_LINK",
16	- ]
17	- )
18	-
19	if use_system_version_of_library("boost"):
20	if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
21	myenv.ConfError("can't find boost headers")