[csw-devel] SF.net SVN: gar:[20705] csw/mgar/pkg/mongodb/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sun Apr 14 13:08:54 CEST 2013


Revision: 20705
          http://gar.svn.sourceforge.net/gar/?rev=20705&view=rev
Author:   wahwah
Date:     2013-04-14 11:08:50 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
mongodb/trunk: Patches updated, but it doesn't build

Modified Paths:
--------------
    csw/mgar/pkg/mongodb/trunk/Makefile
    csw/mgar/pkg/mongodb/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/mongodb/trunk/files/0001-OpenCSW-adaptation.patch

Removed Paths:
-------------
    csw/mgar/pkg/mongodb/trunk/files/0002-library-checking-by-locating-.so-files.patch
    csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch
    csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch

Modified: csw/mgar/pkg/mongodb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mongodb/trunk/Makefile	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/Makefile	2013-04-14 11:08:50 UTC (rev 20705)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = mongodb
-VERSION = 2.0.4
+VERSION = 2.4.1
 
 GARTYPE = v2
 DESCRIPTION = A scalable, high-performance, open source, document-oriented database
@@ -23,9 +23,7 @@
 
 GARCOMPILER = GNU
 
-PATCHFILES += 0002-library-checking-by-locating-.so-files.patch
-PATCHFILES += 0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch
-PATCHFILES += 0004-Try-Boost-libs-without-the-mt-suffix-first.patch
+PATCHFILES = 0001-OpenCSW-adaptation.patch
 
 # Depends on V8 which is available on Solaris 10 x86 only.
 # Can only run on little-endian machines.

Modified: csw/mgar/pkg/mongodb/trunk/checksums
===================================================================
--- csw/mgar/pkg/mongodb/trunk/checksums	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/checksums	2013-04-14 11:08:50 UTC (rev 20705)
@@ -1 +1 @@
-099bc701a3d190a040123c58958e8f67  mongodb-src-r2.0.4.tar.gz
+2123758b166144947860b2af490996c1  mongodb-src-r2.4.1.tar.gz

Added: csw/mgar/pkg/mongodb/trunk/files/0001-OpenCSW-adaptation.patch
===================================================================
--- csw/mgar/pkg/mongodb/trunk/files/0001-OpenCSW-adaptation.patch	                        (rev 0)
+++ csw/mgar/pkg/mongodb/trunk/files/0001-OpenCSW-adaptation.patch	2013-04-14 11:08:50 UTC (rev 20705)
@@ -0,0 +1,42 @@
+From 187c0d72ca598fae56c7dbd63558df1c8fc6f155 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 14 Apr 2013 12:33:16 +0200
+Subject: [PATCH] OpenCSW adaptation
+
+- librt needs to be used
+- /opt/csw/gxx needs to be searched for libraries
+- the -mt versions of boost libraries must be checked first
+---
+ SConstruct | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 219f270..428c24c 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -535,7 +535,10 @@ elif "sunos5" == os.sys.platform:
+      nix = True
+      solaris = True
+      env.Append( CPPDEFINES=[ "__sunos__" ] )
+-     env.Append( LIBS=["socket","resolv"] )
++     env.Append( LIBS=["socket","resolv","rt"] )
++     env.Append( CPPPATH=[ "/opt/csw/gxx/include", "/opt/csw/include" ] )
++     env.Append( LIBPATH=[ "/opt/csw/gxx/lib", "/opt/csw/lib" ] )
++     env.Append( LINKFLAGS=[ "-R/opt/csw/gxx/lib", "-R/opt/csw/lib" ] )
+ 
+ elif os.sys.platform.startswith( "freebsd" ):
+     nix = True
+@@ -812,8 +815,8 @@ def doConfigure(myenv):
+ 
+         for b in boostLibs:
+             l = "boost_" + b
+-            if not conf.CheckLib([ l + boostCompiler + "-mt" + boostVersion,
+-                                   l + boostCompiler + boostVersion ], language='C++' ):
++            if not conf.CheckLib([ l + boostCompiler + boostVersion,
++                                   l + boostCompiler + "-mt" + boostVersion ], language='C++' ):
+                 Exit(1)
+ 
+     if conf.CheckHeader('unistd.h'):
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/mongodb/trunk/files/0002-library-checking-by-locating-.so-files.patch
===================================================================
--- csw/mgar/pkg/mongodb/trunk/files/0002-library-checking-by-locating-.so-files.patch	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/files/0002-library-checking-by-locating-.so-files.patch	2013-04-14 11:08:50 UTC (rev 20705)
@@ -1,37 +0,0 @@
-From 53a89a29c07b6a140ddb5cbb80ec3df4c6994273 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Tue, 14 Dec 2010 12:26:39 +0100
-Subject: [PATCH] library checking by locating .so files
-
-Doing this by checking for .a files doesn't make sense on Solaris, as it's
-impossible to create static binaries, and there are no static libraries in the
-system.
----
- SConstruct |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index e3046ff..154f46f 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -865,6 +865,7 @@ def doConfigure( myenv , needPcre=True , shell=False ):
- 
-     def myCheckLib( poss , failIfNotFound=False , staticOnly=False):
- 
-+        print("myCheckLib(%s, %s, %s)" % (poss, failIfNotFound, staticOnly))
-         if type( poss ) != types.ListType :
-             poss = [poss]
- 
-@@ -877,7 +878,8 @@ def doConfigure( myenv , needPcre=True , shell=False ):
- 
-             for p in poss:
-                 for loc in allPlaces:
--                    fullPath = loc + "/lib" + p + ".a"
-+                    fullPath = loc + "/lib" + p + ".so"
-+                    print("Checking for %s" %  fullPath)
-                     if os.path.exists( fullPath ):
-                         myenv['_LIBFLAGS']='${_stripixes(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)} $SLIBS'
-                         myenv.Append( SLIBS=" " + fullPath + " " )
--- 
-1.7.3.2
-

Deleted: csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch
===================================================================
--- csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch	2013-04-14 11:08:50 UTC (rev 20705)
@@ -1,28 +0,0 @@
-From 6ea5d8231df11e63384b0236ab4485294ca2f104 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sun, 11 Mar 2012 17:48:51 +0000
-Subject: [PATCH] Hardcode OpenCSW specifics in the Solaris section
-
-If SConstruct has hardcoded Solaris paths, why not add OpenCSW specific
-paths.
----
- SConstruct              |    5 +-
- shell/mongo_vstudio.cpp |  204 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 208 insertions(+), 1 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 2d0c86f..787a81c 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -543,7 +543,10 @@ elif "sunos5" == os.sys.platform:
-      nix = True
-      solaris = True
-      env.Append( CPPDEFINES=[ "__sunos__" ] )
--     env.Append( LIBS=["socket","resolv"] )
-+     env.Append( LIBS=["socket","resolv","rt"] )
-+     env.Append( CPPPATH=[ "/opt/csw/gxx/include", "/opt/csw/include" ] )
-+     env.Append( LIBPATH=[ "/opt/csw/gxx/lib", "/opt/csw/lib" ] )
-+     env.Append( LINKFLAGS=[ "-R/opt/csw/gxx/lib", "-R/opt/csw/lib" ] )
- 
- elif os.sys.platform.startswith( "freebsd" ):
-     nix = True

Deleted: csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch
===================================================================
--- csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch	2013-04-14 11:08:50 UTC (rev 20705)
@@ -1,34 +0,0 @@
-From 7b0401af0182b887a7070ce4efbb3e7acd9ab9c4 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Mon, 12 Mar 2012 19:10:49 +0100
-Subject: [PATCH] Try Boost libs without the mt suffix first
-
----
- SConstruct |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 787a81c..db429ee 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -945,13 +945,13 @@ def doConfigure( myenv , shell=False ):
-             print( "WARNING: old version of boost - you should consider upgrading" )
- 
-     # this will add it if it exists and works
--    myCheckLib( [ "boost_system" + boostCompiler + "-mt" + boostVersion ,
--                  "boost_system" + boostCompiler + boostVersion ] )
-+    myCheckLib( [ "boost_system" + boostCompiler + boostVersion ,
-+                  "boost_system" + boostCompiler + "-mt" + boostVersion ] )
- 
-     for b in boostLibs:
-         l = "boost_" + b
--        myCheckLib( [ l + boostCompiler + "-mt" + boostVersion ,
--                      l + boostCompiler + boostVersion ] ,
-+        myCheckLib( [ l + boostCompiler + boostVersion ,
-+                      l + boostCompiler + "-mt" + boostVersion ] ,
-                     release or not shell)
- 
-     if not conf.CheckCXXHeader( "execinfo.h" ):
--- 
-1.7.9
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list