diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-04-08 08:48:14 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:44 -0700 |
commit | 15b09d8325d7edfcd8c9311e725f00f14a541f17 (patch) | |
tree | 425ace1339f2062cb7d19a537bd734c1338906ba /meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch | |
parent | a5d4a339153807934be987dcbc2833760be7ae1c (diff) | |
download | meta-openembedded-15b09d8325d7edfcd8c9311e725f00f14a541f17.tar.gz |
mongodb: refresh patches and remove un-needed patch
[V2]
remove patch, changes upstream
[v3]
Actually remove the patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch')
-rw-r--r-- | meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch index 09d49d28c..aa01e954f 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch +++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch | |||
@@ -9,11 +9,11 @@ Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> | |||
9 | src/mongo/util/SConscript | 2 ++ | 9 | src/mongo/util/SConscript | 2 ++ |
10 | 2 files changed, 8 insertions(+), 2 deletions(-) | 10 | 2 files changed, 8 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/SConstruct b/SConstruct | 12 | Index: git/SConstruct |
13 | index 5082a4b..3370f70 100644 | 13 | =================================================================== |
14 | --- a/SConstruct | 14 | --- git.orig/SConstruct |
15 | +++ b/SConstruct | 15 | +++ git/SConstruct |
16 | @@ -507,6 +507,7 @@ def variable_arch_converter(val): | 16 | @@ -548,6 +548,7 @@ def variable_arch_converter(val): |
17 | 'amd64': 'x86_64', | 17 | 'amd64': 'x86_64', |
18 | 'emt64': 'x86_64', | 18 | 'emt64': 'x86_64', |
19 | 'x86': 'i386', | 19 | 'x86': 'i386', |
@@ -21,8 +21,8 @@ index 5082a4b..3370f70 100644 | |||
21 | } | 21 | } |
22 | val = val.lower() | 22 | val = val.lower() |
23 | 23 | ||
24 | @@ -568,7 +569,8 @@ env_vars.Add('ARFLAGS', | 24 | @@ -627,7 +628,8 @@ env_vars.Add( |
25 | converter=variable_shlex_converter) | 25 | ) |
26 | 26 | ||
27 | env_vars.Add('CC', | 27 | env_vars.Add('CC', |
28 | - help='Select the C compiler to use') | 28 | - help='Select the C compiler to use') |
@@ -31,7 +31,7 @@ index 5082a4b..3370f70 100644 | |||
31 | 31 | ||
32 | env_vars.Add('CCFLAGS', | 32 | env_vars.Add('CCFLAGS', |
33 | help='Sets flags for the C and C++ compiler', | 33 | help='Sets flags for the C and C++ compiler', |
34 | @@ -588,7 +590,8 @@ env_vars.Add('CPPPATH', | 34 | @@ -647,7 +649,8 @@ env_vars.Add('CPPPATH', |
35 | converter=variable_shlex_converter) | 35 | converter=variable_shlex_converter) |
36 | 36 | ||
37 | env_vars.Add('CXX', | 37 | env_vars.Add('CXX', |
@@ -41,7 +41,7 @@ index 5082a4b..3370f70 100644 | |||
41 | 41 | ||
42 | env_vars.Add('CXXFLAGS', | 42 | env_vars.Add('CXXFLAGS', |
43 | help='Sets flags for the C++ compiler', | 43 | help='Sets flags for the C++ compiler', |
44 | @@ -818,6 +821,7 @@ envDict = dict(BUILD_ROOT=buildDir, | 44 | @@ -895,6 +898,7 @@ envDict = dict(BUILD_ROOT=buildDir, |
45 | ) | 45 | ) |
46 | 46 | ||
47 | env = Environment(variables=env_vars, **envDict) | 47 | env = Environment(variables=env_vars, **envDict) |
@@ -49,19 +49,16 @@ index 5082a4b..3370f70 100644 | |||
49 | del envDict | 49 | del envDict |
50 | 50 | ||
51 | env.AddMethod(env_os_is_wrapper, 'TargetOSIs') | 51 | env.AddMethod(env_os_is_wrapper, 'TargetOSIs') |
52 | diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript | 52 | Index: git/src/mongo/util/SConscript |
53 | index 6add602..8d05a62 100644 | 53 | =================================================================== |
54 | --- a/src/mongo/util/SConscript | 54 | --- git.orig/src/mongo/util/SConscript |
55 | +++ b/src/mongo/util/SConscript | 55 | +++ git/src/mongo/util/SConscript |
56 | @@ -251,6 +251,8 @@ if get_option('allocator') == 'tcmalloc': | 56 | @@ -274,6 +274,8 @@ if env['MONGO_ALLOCATOR'] == 'tcmalloc': |
57 | 'MONGO_HAVE_GPERFTOOLS_GET_THREAD_CACHE_SIZE' | 57 | 'MONGO_HAVE_GPERFTOOLS_SIZE_CLASS_STATS' |
58 | ] | 58 | ] |
59 | ) | 59 | ) |
60 | + if not use_system_version_of_library('valgrind'): | 60 | + if not use_system_version_of_library('valgrind'): |
61 | + tcmspEnv.InjectThirdPartyIncludePaths('valgrind') | 61 | + tcmspEnv.InjectThirdPartyIncludePaths('valgrind') |
62 | 62 | ||
63 | tcmspEnv.Library( | 63 | if not use_system_version_of_library('valgrind'): |
64 | target='tcmalloc_set_parameter', | 64 | # Include valgrind since tcmalloc disables itself while running under valgrind |
65 | -- | ||
66 | 1.9.1 | ||
67 | |||