← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mongodb/utopic

« back to all changes in this revision

Viewing changes to debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-07-03 09:23:46 UTC
  • mfrom: (1.3.10) (44.1.14 sid)
  • Revision ID: package-import@ubuntu.com-20140703092346-c5bvt46wnzougyly
Tags: 1:2.6.3-0ubuntu1
https://launchpad.net/bugs/1295723
https://launchpad.net/bugs/1294455
* New upstream stable release:
  - Dropped patches, included upstream:
    + 0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch
    + 0008-Use-system-libstemmer.patch
    + 0011-Use-a-signed-char-to-store-BSONType-enumerations.patch
    + 0001-SERVER-12064-Atomic-operations-for-gcc-non-Intel-arc.patch
    + 0002-SERVER-12065-Support-ARM-and-AArch64-builds.patch
  - d/p/*: Refreshed/rebased remaining patches.
  - Use system provided libyaml-cpp:
    + d/control: Add libyaml-cpp-dev to BD's.
    + d/rules: Enable --with-system-yaml option.
    + d/p/fix-yaml-detection.patch: Fix detection of libyaml-cpp library.
  - d/mongodb-server.mongodb.upstart: Sync changes from upstream.
  - d/control,mongodb-dev.*: Drop mongodb-dev package; it has no reverse
    dependencies and upstream no longer install header files.
  - d/NEWS: Point users to upstream upgrade documentation for upgrades
    from 2.4 to 2.6.
* Merge from Debian unstable.
* d/control: BD on libv8-3.14-dev to ensure that transitioning to new v8
  versions is a explicit action due to changes in behaviour in >= 3.25
  (LP: #1295723).
* d/mongodb-server.prerm: Dropped debug echo call from maintainer script
  (LP: #1294455).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch
6
6
 SConstruct | 4 +++-
7
7
 1 file changed, 3 insertions(+), 1 deletion(-)
8
8
 
9
 
diff --git a/SConstruct b/SConstruct
10
 
index 5fb0e83..f3ac3f9 100644
11
9
--- a/SConstruct
12
10
+++ b/SConstruct
13
 
@@ -344,6 +344,8 @@ libdeps.setup_environment( env )
 
11
@@ -66,7 +66,7 @@ solaris = False
 
12
 if "darwin" == platform:
 
13
     darwin = True
 
14
     platform = "osx" # prettier than darwin
 
15
-elif platform.startswith("linux"):
 
16
+elif platform.startswith("linux") or platform.startswith("gnukfreebsd"):
 
17
     linux = True
 
18
     platform = "linux"
 
19
 elif "sunos5" == platform:
 
20
@@ -526,6 +526,8 @@ libdeps.setup_environment( env )
14
21
 
15
22
 if env['PYSYSPLATFORM'] == 'linux3':
16
23
     env['PYSYSPLATFORM'] = 'linux2'
19
26
 if 'freebsd' in env['PYSYSPLATFORM']:
20
27
     env['PYSYSPLATFORM'] = 'freebsd'
21
28
 
22
 
@@ -524,7 +526,7 @@ if "darwin" == os.sys.platform:
23
 
        env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
24
 
        env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
25
 
 
26
 
-elif os.sys.platform.startswith("linux"):
27
 
+elif os.sys.platform.startswith("linux") or os.sys.platform.startswith("gnukfreebsd"):
28
 
     linux = True
29
 
     platform = "linux"
30