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

[wahwah at users.sourceforge.net]

Revision: 17376
          http://gar.svn.sourceforge.net/gar/?rev=17376&view=rev
Author:   wahwah
Date:     2012-03-11 17:52:15 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
Hardcode OpenCSW paths in SConstruct

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

Added Paths:
-----------
    csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch

Modified: csw/mgar/pkg/mongodb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mongodb/trunk/Makefile	2012-03-11 14:49:42 UTC (rev 17375)
+++ csw/mgar/pkg/mongodb/trunk/Makefile	2012-03-11 17:52:15 UTC (rev 17376)
@@ -21,14 +21,14 @@
 
 GARCOMPILER = GNU
 
-# PATCHFILES += 0001-Disabling-the-libstdc-check.patch
 PATCHFILES += 0002-library-checking-by-locating-.so-files.patch
+PATCHFILES += 0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch
 
 # Depends on V8 which is available on Solaris 10 x86 only.
 # Can only run on little-endian machines.
 PACKAGING_PLATFORMS = solaris10-i386
 
-# scons libboost-dev libpcre++-dev xulrunner-1.9.1-dev
+EXTRA_RUNPATH_DIRS = $(prefix)/gxx/lib
 
 BUILD_DEP_PKGS += CSWboost-gcc-dev
 BUILD_DEP_PKGS += CSWgcc4g++
@@ -39,14 +39,14 @@
 BUILD_DEP_PKGS += CSWscons
 BUILD_DEP_PKGS += CSWsnappy-gxx-dev
 
-SCONS_FLAGS += --libpath=$(libdir)
-SCONS_FLAGS += --extrapath=$(BUILD_PREFIX),$(prefix)
-SCONS_FLAGS += --cxx=$(BUILD_PREFIX)/bin/g++
+SCONS_FLAGS += --libpath=$(prefix)/gxx/lib
+SCONS_FLAGS += --extrapath=$(prefix)/gxx,$(prefix)
+SCONS_FLAGS += --cxx=$(prefix)/bin/g++
 SCONS_FLAGS += --use-system-all
 SCONS_FLAGS += --extralib=rt,pcre
 SCONS_FLAGS += --release all
 
-SCONS_ENV = LIBPATH=$(libdir)
+SCONS_ENV = LIBPATH=$(prefix)/gxx/lib
 
 include gar/category.mk
 

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch	2012-03-11 17:52:15 UTC (rev 17376)
@@ -0,0 +1,28 @@
+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

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