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

« back to all changes in this revision

Viewing changes to src/mongo/bson/bsondemo/bsondemo.vcxproj

  • 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:
159
159
    <ClCompile>
160
160
      <Optimization>Disabled</Optimization>
161
161
      <AdditionalIncludeDirectories>..\..\..;..\..\..\third_party\boost</AdditionalIncludeDirectories>
162
 
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
162
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
163
163
      <MinimalRebuild>No</MinimalRebuild>
164
164
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
165
165
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
178
178
    <ClCompile>
179
179
      <Optimization>Disabled</Optimization>
180
180
      <AdditionalIncludeDirectories>..\..\..;..\..\..\third_party\boost</AdditionalIncludeDirectories>
181
 
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
181
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
182
182
      <MinimalRebuild>No</MinimalRebuild>
183
183
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
184
184
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
197
197
    <ClCompile>
198
198
      <Optimization>Disabled</Optimization>
199
199
      <AdditionalIncludeDirectories>..\..\..;..\..\..\third_party\boost</AdditionalIncludeDirectories>
200
 
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
200
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
201
201
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
202
202
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
203
203
      <WarningLevel>Level3</WarningLevel>
215
215
    <ClCompile>
216
216
      <Optimization>Disabled</Optimization>
217
217
      <AdditionalIncludeDirectories>..\..\..;..\..\..\third_party\boost</AdditionalIncludeDirectories>
218
 
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
218
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
219
219
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
220
220
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
221
221
      <WarningLevel>Level3</WarningLevel>
233
233
    <ClCompile>
234
234
      <Optimization>MaxSpeed</Optimization>
235
235
      <IntrinsicFunctions>true</IntrinsicFunctions>
236
 
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
236
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
237
237
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
238
238
      <FunctionLevelLinking>true</FunctionLevelLinking>
239
239
      <WarningLevel>Level3</WarningLevel>
255
255
    <ClCompile>
256
256
      <Optimization>MaxSpeed</Optimization>
257
257
      <IntrinsicFunctions>true</IntrinsicFunctions>
258
 
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
258
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
259
259
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
260
260
      <FunctionLevelLinking>true</FunctionLevelLinking>
261
261
      <WarningLevel>Level3</WarningLevel>
277
277
    <ClCompile>
278
278
      <Optimization>MaxSpeed</Optimization>
279
279
      <IntrinsicFunctions>true</IntrinsicFunctions>
280
 
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
280
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
281
281
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
282
282
      <FunctionLevelLinking>true</FunctionLevelLinking>
283
283
      <WarningLevel>Level3</WarningLevel>
298
298
    <ClCompile>
299
299
      <Optimization>MaxSpeed</Optimization>
300
300
      <IntrinsicFunctions>true</IntrinsicFunctions>
301
 
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
301
      <PreprocessorDefinitions>BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
302
302
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
303
303
      <FunctionLevelLinking>true</FunctionLevelLinking>
304
304
      <WarningLevel>Level3</WarningLevel>