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

[wahwah at users.sourceforge.net]

Revision: 17388
          http://gar.svn.sourceforge.net/gar/?rev=17388&view=rev
Author:   wahwah
Date:     2012-03-12 21:03:08 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
Work around a library finding problem.

Also, update dependencies.

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

Added Paths:
-----------
    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	2012-03-12 15:00:35 UTC (rev 17387)
+++ csw/mgar/pkg/mongodb/trunk/Makefile	2012-03-12 21:03:08 UTC (rev 17388)
@@ -26,6 +26,7 @@
 
 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
 
 # Depends on V8 which is available on Solaris 10 x86 only.
 # Can only run on little-endian machines.
@@ -35,8 +36,7 @@
 
 BUILD_DEP_PKGS += CSWboost-gcc-dev
 BUILD_DEP_PKGS += CSWgcc4g++
-# BUILD_DEP_PKGS += CSWlibmozjs185-gxx-dev
-BUILD_DEP_PKGS += CSWlibjs-gxx-dev
+BUILD_DEP_PKGS += CSWlibjs-dev
 BUILD_DEP_PKGS += CSWlibpcap-dev
 BUILD_DEP_PKGS += CSWlibpcre-gxx-dev
 BUILD_DEP_PKGS += CSWscons
@@ -44,7 +44,7 @@
 
 SCONS_FLAGS += --libpath=$(prefix)/gxx/lib
 SCONS_FLAGS += --extrapath=$(prefix)/gxx,$(prefix)
-SCONS_FLAGS += --cxx=$(prefix)/bin/g++
+SCONS_FLAGS += --cxx=$(CXX)
 SCONS_FLAGS += --use-system-all
 SCONS_FLAGS += --extralib=rt,pcre
 SCONS_FLAGS += --release all
@@ -56,7 +56,7 @@
 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-system1-49-0-gxx
 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibboost-thread1-49-0-gxx
 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWmongodb += CSWlibjs1-7-0-gxx
+RUNTIME_DEP_PKGS_CSWmongodb += CSWlibjs1-7-0
 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcap1
 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcre1-gxx
 RUNTIME_DEP_PKGS_CSWmongodb += CSWlibpcrecpp0-gxx

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch	2012-03-12 21:03:08 UTC (rev 17388)
@@ -0,0 +1,34 @@
+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.