| 1 |
ultrabug 13/06/05 09:59:46 |
| 2 |
|
| 3 |
Added: mongodb-2.4.4-fix-sharedclient.patch |
| 4 |
Removed: mongodb-2.4-fix-sharedclient.patch |
| 5 |
Log: |
| 6 |
Version bump, drop old, fix #471784 |
| 7 |
|
| 8 |
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key B658FA13) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-db/mongodb/files/mongodb-2.4.4-fix-sharedclient.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-2.4.4-fix-sharedclient.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-2.4.4-fix-sharedclient.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: mongodb-2.4.4-fix-sharedclient.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/src/mongo/SConscript b/src/mongo/SConscript |
| 19 |
index c026ce9..bbd900c 100644 |
| 20 |
--- a/src/mongo/SConscript |
| 21 |
+++ b/src/mongo/SConscript |
| 22 |
@@ -452,7 +452,7 @@ |
| 23 |
env.Library('stacktrace', 'util/stacktrace.cpp') |
| 24 |
|
| 25 |
env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp', |
| 26 |
- LIBDEPS=['stacktrace', |
| 27 |
+ LIBDEPS=['stacktrace', 'foundation', 'mongocommon', 'alltools', |
| 28 |
'$BUILD_DIR/mongo/base/base']) |
| 29 |
|
| 30 |
serverOnlyFiles += mmapFiles |
| 31 |
@@ -654,10 +654,6 @@ |
| 32 |
"defaultversion", |
| 33 |
"gridfs", |
| 34 |
"notmongodormongos"]) |
| 35 |
-env.Library("allclient", "client/clientOnly.cpp", LIBDEPS=["clientandshell"]) |
| 36 |
- |
| 37 |
-if has_option( "sharedclient" ): |
| 38 |
- sharedClientLibName = str( env.SharedLibrary( "mongoclient", [], LIBDEPS=["allclient"] )[0] ) |
| 39 |
|
| 40 |
# dbtests test binary |
| 41 |
env.StaticLibrary('testframework', ['dbtests/framework.cpp'], LIBDEPS=['unittest/unittest']) |
| 42 |
@@ -806,12 +802,6 @@ |
| 43 |
env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.h" ) ) |
| 44 |
env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.hpp" ) ) |
| 45 |
|
| 46 |
-#lib |
| 47 |
-if installSetup.libraries: |
| 48 |
- env.Install('$INSTALL_DIR/$NIX_LIB_DIR', '#${LIBPREFIX}mongoclient${LIBSUFFIX}') |
| 49 |
- if has_option( "sharedclient" ): |
| 50 |
- env.Install( "$INSTALL_DIR/$NIX_LIB_DIR", '#${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}') |
| 51 |
- |
| 52 |
# Stage the top-level mongodb banners |
| 53 |
distsrc = env.Dir('#distsrc') |
| 54 |
env.Append(MODULE_BANNERS = [distsrc.File('README'), |
| 55 |
diff --git a/src/SConscript.client b/src/SConscript.client |
| 56 |
index b88a54f..a15bbb3 100644 |
| 57 |
--- a/src/SConscript.client |
| 58 |
+++ b/src/SConscript.client |
| 59 |
@@ -4,6 +4,7 @@ |
| 60 |
# programs. |
| 61 |
|
| 62 |
Import('env clientEnv') |
| 63 |
+Import("has_option") |
| 64 |
|
| 65 |
env.Command(['mongo/base/error_codes.h', 'mongo/base/error_codes.cpp',], |
| 66 |
['mongo/base/generate_error_codes.py', 'mongo/base/error_codes.err'], |
| 67 |
@@ -36,7 +37,6 @@ clientSourceBasic = [ |
| 68 |
'mongo/client/dbclient.cpp', |
| 69 |
'mongo/client/dbclient_rs.cpp', |
| 70 |
'mongo/client/dbclientcursor.cpp', |
| 71 |
- 'mongo/client/distlock.cpp', |
| 72 |
'mongo/client/gridfs.cpp', |
| 73 |
'mongo/client/model.cpp', |
| 74 |
'mongo/client/sasl_client_authenticate.cpp', |
| 75 |
@@ -83,7 +83,6 @@ clientSourceBasic = [ |
| 76 |
'mongo/util/timer.cpp', |
| 77 |
'mongo/util/trace.cpp', |
| 78 |
'mongo/util/util.cpp', |
| 79 |
- 'mongo/util/version.cpp', |
| 80 |
] |
| 81 |
|
| 82 |
clientSourceSasl = ['mongo/client/sasl_client_authenticate_impl.cpp', |
| 83 |
@@ -93,6 +92,7 @@ clientSourceAll = clientSourceBasic + clientSourceSasl |
| 84 |
|
| 85 |
if env['MONGO_BUILD_SASL_CLIENT']: |
| 86 |
clientSource = clientSourceAll |
| 87 |
+ env.Append(LIBS="sasl2") |
| 88 |
else: |
| 89 |
clientSource = clientSourceBasic |
| 90 |
|
| 91 |
@@ -133,16 +133,18 @@ for path in clientHeaderDirectories: |
| 92 |
clientHeaders.extend(Glob('mongo/%s/*.h' % path)) |
| 93 |
clientHeaders.extend(Glob('mongo/%s/*.hpp' % path)) |
| 94 |
|
| 95 |
-mongoclient_lib = env.Library('mongoclient', clientSource), |
| 96 |
-mongoclient_install = env.Install('#/', [ |
| 97 |
- mongoclient_lib, |
| 98 |
- #env.SharedLibrary('mongoclient', clientSource), |
| 99 |
- ]) |
| 100 |
+ |
| 101 |
+mongoclient_libs = [ env.Library('mongoclient', clientSource) ] |
| 102 |
+if has_option( "sharedclient" ): |
| 103 |
+ mongoclient_libs.append( env.SharedLibrary('mongoclient', clientSource) ) |
| 104 |
+ |
| 105 |
+mongoclient_install = env.Install('#/', mongoclient_libs) |
| 106 |
+ |
| 107 |
env.Alias('mongoclient', mongoclient_install) |
| 108 |
|
| 109 |
clientTests = clientEnv.Install('#/', [ |
| 110 |
clientEnv.Program(target, |
| 111 |
- [source, mongoclient_lib]) for (target, source) in exampleSourceMap]) |
| 112 |
+ [source, mongoclient_libs[-1]]) for (target, source) in exampleSourceMap]) |
| 113 |
|
| 114 |
clientTests.append( |
| 115 |
clientEnv.Install('#/', clientEnv.Program('bsondemo', 'mongo/bson/bsondemo/bsondemo.cpp'))) |
| 116 |
@@ -177,6 +179,8 @@ env.Install( |
| 117 |
prefix = GetOption("prefix") |
| 118 |
|
| 119 |
env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}') |
| 120 |
+if has_option( "sharedclient" ): |
| 121 |
+ env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}') |
| 122 |
|
| 123 |
for x in clientHeaderDirectories: |
| 124 |
inst = env.Install(prefix + "/include/mongo/" + x, |
Archives