[Lunar-commits] <moonbase-other> mongodb: use CXXFLAGS and properly load lunar ENV in scons

[Stefan Wold]

commit c879fe0bf326105020527e2e83c85d627c27cd1c
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sun, 21 Apr 2013 13:08:49 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/c879fe0bf326105020527e2e83c85d627c27cd1c

mongodb: use CXXFLAGS and properly load lunar ENV in scons

Mongodb now use system boost and pcre rather than built in versions.
---
  sql/mongodb/BUILD   | +10/-5    
  sql/mongodb/DEPENDS | +1/-0     
  sql/mongodb/DETAILS | +6/-0     
  3 files changed, 17 insertions(+), 5 deletions(-)

--- a/sql/mongodb/BUILD
+++ b/sql/mongodb/BUILD
@@ -1,17 +1,22 @@
+OPTS+=" --use-system-boost --use-system-pcre"
+
+# Honor CXXFLAGS and remove -ggdb
+patch_it $SOURCE3 1 &&
+
+# Propagate Lunar ENV to scons
+patch_it $SOURCE4 1 &&
+
 # that linking dependency is just too stupid. Simply remove the debug function call for now
 sedit 's:(" << errnoWithDescription(err) << ")":":' src/mongo/util/stacktrace.cpp &&
 
 # gcc 4.8 does find something to warn about ;)
 sedit 's:"-Werror",:\0 "-Wno-unused-local-typedefs", "-Wno-unused-variable",:' SConstruct &&
 
-# respect our PATH variable(for wrapper support) -- this does not seem to work
-sedit "s/env = Environment(/\0 ENV={'PATH' : os.environ['PATH']}, /" SConstruct &&
-
 add_priv_user mongodb:mongodb -d /var/lib/mongodb  &&
 
-scons -j${MAKES:=1} all &&
+scons -j${MAKES:=1} $OPTS all &&
 prepare_install &&
-scons -j${MAKES:=1} install --full --prefix=/usr &&
+scons -j${MAKES:=1} $OPTS install --full --prefix=/usr &&
 
 if [ ! -f /etc/mongodb.conf ]; then
   install -m 644 $SOURCE_CACHE/$SOURCE2 /etc/mongodb.conf
--- a/sql/mongodb/DEPENDS
+++ b/sql/mongodb/DEPENDS
@@ -1,3 +1,4 @@
 depends boost
 depends scons
 depends libpcap
+depends pcre
--- a/sql/mongodb/DETAILS
+++ b/sql/mongodb/DETAILS
@@ -2,11 +2,17 @@
          VERSION=2.4.2
           SOURCE=$MODULE-src-r$VERSION.tar.gz
          SOURCE2=mongodb.conf-0.3
+         SOURCE3=mongodb-2.2-r1-fix-scons.patch
+         SOURCE4=mongodb-2.4.2-use-system-path.patch
       SOURCE_URL=http://downloads.mongodb.org/src
      SOURCE2_URL=$PATCH_URL
+     SOURCE3_URL=$PATCH_URL
+     SOURCE4_URL=$PATCH_URL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-src-r$VERSION
       SOURCE_VFY=sha256:d0a26fef7f425a6652ebfc3addbc7e1b01a10be65c9d68e464730687bd6721c3
      SOURCE2_VFY=sha256:29e47681c4a9325a8288e3f5c3591138f08bce36178c21a0a4b41bf4b05922dc
+     SOURCE3_VFY=sha256:fe19ffdd046abeb375978dd3ebcb21b3a605206ef9f8dea2bb7620327cc6f7db
+     SOURCE4_VFY=sha256:8907e4be5546ec7ea0146989d4d64d115b66a893adb7f1015ceba67e297c7dd0
         WEB_SITE=http://www.mongodb.org/
          ENTERED=20101205
          UPDATED=20130421