~evarlast/ubuntu/trusty/mongodb/upstart-workaround-debian-bug-718702

« back to all changes in this revision

Viewing changes to src/mongo/s/mongos.sln

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Robie Basak
  • Date: 2013-05-29 17:44:42 UTC
  • mfrom: (44.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130529174442-z0a4qmoww4y0t458
Tags: 1:2.4.3-1ubuntu1
[ James Page ]
* Merge from Debian unstable, remaining changes:
  - Enable SSL support:
    + d/control: Add libssl-dev to BD's.
    + d/rules: Enabled --ssl option.
    + d/mongodb.conf: Add example SSL configuration options.
  - d/mongodb-server.mongodb.upstart: Add upstart configuration.
  - d/rules: Don't strip binaries during scons build for Ubuntu.
  - d/control: Add armhf to target archs.
  - d/p/SConscript.client.patch: fixup install of client libraries.
  - d/p/0010-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch:
    Install libraries to lib not lib64.
* Dropped changes:
  - d/p/arm-support.patch: Included in Debian.
  - d/p/double-alignment.patch: Included in Debian.
  - d/rules,control: Debian also builds with avaliable system libraries
    now.
* Fix FTBFS due to gcc and boost upgrades in saucy:
  - d/p/0008-ignore-unused-local-typedefs.patch: Add -Wno-unused-typedefs
    to unbreak building with g++-4.8.
  - d/p/0009-boost-1.53.patch: Fixup signed/unsigned casting issue.

[ Robie Basak ]
* d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
  build failure on ARM due to missing signed'ness of char cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
Microsoft Visual Studio Solution File, Format Version 11.00
3
3
# Visual Studio 2010
4
4
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongos", "mongos.vcxproj", "{E03717ED-69B4-4D21-BC55-DF6690B585C6}"
5
 
        ProjectSection(ProjectDependencies) = postProject
6
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A} = {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}
7
 
        EndProjectSection
8
 
EndProject
9
 
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpiderMonkey pre-build step", "..\..\third_party\js-1.7\SpiderMonkey-prebuild.vcxproj", "{7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}"
10
5
EndProject
11
6
Global
12
7
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
36
31
                {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|Win32.Build.0 = Win2008PlusRelease|Win32
37
32
                {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|x64.ActiveCfg = Win2008PlusRelease|x64
38
33
                {E03717ED-69B4-4D21-BC55-DF6690B585C6}.Win2008PlusRelease|x64.Build.0 = Win2008PlusRelease|x64
39
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Debug|Win32.ActiveCfg = Debug|Win32
40
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Debug|Win32.Build.0 = Debug|Win32
41
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Debug|x64.ActiveCfg = Debug|x64
42
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Debug|x64.Build.0 = Debug|x64
43
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Release|Win32.ActiveCfg = Release|Win32
44
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Release|Win32.Build.0 = Release|Win32
45
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Release|x64.ActiveCfg = Release|x64
46
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Release|x64.Build.0 = Release|x64
47
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Win2008PlusDebug|Win32.ActiveCfg = Debug|Win32
48
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Win2008PlusDebug|Win32.Build.0 = Debug|Win32
49
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Win2008PlusDebug|x64.ActiveCfg = Debug|x64
50
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Win2008PlusDebug|x64.Build.0 = Debug|x64
51
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Win2008PlusRelease|Win32.ActiveCfg = Release|Win32
52
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Win2008PlusRelease|Win32.Build.0 = Release|Win32
53
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Win2008PlusRelease|x64.ActiveCfg = Release|x64
54
 
                {7FA15DF8-14C8-4FD5-897B-6FACE8FDCF2A}.Win2008PlusRelease|x64.Build.0 = Release|x64
55
34
        EndGlobalSection
56
35
        GlobalSection(SolutionProperties) = preSolution
57
36
                HideSolutionNode = FALSE