Gentoo Archives: gentoo-commits

From: "Alexys Jacob (ultrabug)" <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/mongodb/files: mongodb-linux3.patch
Date: Fri, 29 Jul 2011 15:35:24
Message-Id: 20110729153514.2C47C20051@flycatcher.gentoo.org
1 ultrabug 11/07/29 15:35:14
2
3 Added: mongodb-linux3.patch
4 Log:
5 Fix linux-3 kernel compilation wrt #375353
6
7 (Portage version: 2.1.10.7/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-db/mongodb/files/mongodb-linux3.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-linux3.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-linux3.patch?rev=1.1&content-type=text/plain
14
15 Index: mongodb-linux3.patch
16 ===================================================================
17 From b1ec2058673f8ca582a490c2dd4a8405698221ae Mon Sep 17 00:00:00 2001
18 From: Eliot Horowitz <eliot@×××××.com>
19 Date: Thu, 28 Jul 2011 19:54:51 -0400
20 Subject: [PATCH] compile on linux3 SERVER-3457
21
22 ---
23 SConstruct | 4 +++-
24 distsrc/client/SConstruct | 2 +-
25 2 files changed, 4 insertions(+), 2 deletions(-)
26
27 diff --git a/SConstruct b/SConstruct
28 index 55d34d5..c47d3f6 100644
29 --- a/SConstruct
30 +++ b/SConstruct
31 @@ -343,6 +343,8 @@ processInfoFiles = [ "util/processinfo.cpp" ]
32
33 if os.path.exists( "util/processinfo_" + os.sys.platform + ".cpp" ):
34 processInfoFiles += [ "util/processinfo_" + os.sys.platform + ".cpp" ]
35 +elif os.sys.platform == "linux3":
36 + processInfoFiles += [ "util/processinfo_linux2.cpp" ]
37 else:
38 processInfoFiles += [ "util/processinfo_none.cpp" ]
39
40 @@ -474,7 +476,7 @@ if "darwin" == os.sys.platform:
41 env.Append( CPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
42 env.Append( LIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
43
44 -elif "linux2" == os.sys.platform:
45 +elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
46 linux = True
47 platform = "linux"
48
49 diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct
50 index c2d309a..54fc943 100755
51 --- a/distsrc/client/SConstruct
52 +++ b/distsrc/client/SConstruct
53 @@ -41,7 +41,7 @@ linux = False
54 if "darwin" == os.sys.platform:
55 addExtraLibs( "/opt/local/" )
56 nix = True
57 -elif "linux2" == os.sys.platform:
58 +elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
59 nix = True
60 linux = True
61
62 --
63 1.7.5.4