[Lunar-commits] <moonbase-other> scons: hell yeah, 2.4.2 finally compiles

[v4hn]

commit 518f037c1575a65fc4ea03a7f526caca0550021f
Author: v4hn <me at v4hn.de>
Date: Sun, 21 Apr 2013 12:41:44 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/518f037c1575a65fc4ea03a7f526caca0550021f

scons: hell yeah, 2.4.2 finally compiles

TODO: fix shared libmongoclient library(this builds only the static)
TODO: make wrapper scripts work
---
  sql/mongodb/BUILD   | +22/-16   
  sql/mongodb/DETAILS | +3/-6     
  2 files changed, 25 insertions(+), 22 deletions(-)

--- a/sql/mongodb/BUILD
+++ b/sql/mongodb/BUILD
@@ -1,23 +1,29 @@
-(
-  # Fix for https://jira.mongodb.org/browse/SERVER-5575
-  patch_it $SOURCE3 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 &&
 
-  add_priv_user mongodb:mongodb -d /var/lib/mongodb  &&
+# gcc 4.8 does find something to warn about ;)
+sedit 's:"-Werror",:\0 "-Wno-unused-local-typedefs", "-Wno-unused-variable",:' SConstruct &&
 
-  scons -j${MAKES:=1} all --full &&
-  prepare_install &&
-  scons -j${MAKES:=1} install --full --prefix=/usr &&
+# respect our PATH variable(for wrapper support) -- this does not seem to work
+sedit "s/env = Environment(/\0 ENV={'PATH' : os.environ['PATH']}, /" SConstruct &&
 
-  rm -f /usr/lib/libmongoclient.a &&
+add_priv_user mongodb:mongodb -d /var/lib/mongodb  &&
 
-  [ -f /etc/mongodb.conf ] || install -m 644 $SOURCE_CACHE/$SOURCE2 /etc/mongodb.conf &&
+scons -j${MAKES:=1} all &&
+prepare_install &&
+scons -j${MAKES:=1} install --full --prefix=/usr &&
 
-  if module_installed systemd; then
+if [ ! -f /etc/mongodb.conf ]; then
+  install -m 644 $SOURCE_CACHE/$SOURCE2 /etc/mongodb.conf
+fi &&
+
+if module_installed systemd; then
     # Manually create /run/mongodb now, systemd tmpfiles.d will handle this next boot
-    [ -d /run/mongodb ] || install -d -o mongodb -g root -m 0755 /run/mongodb
-  fi &&
+  if [ ! -d /run/mongodb ]; then
+    install -d -o mongodb -g root -m 0755 /run/mongodb
+  fi
+fi &&
 
-  for i in /var/{lib,log}/mongodb; do
-    install -d $i -o mongodb -g mongodb -m 770
-  done
-) > $C_FIFO 2>&1
+for i in /var/{lib,log}/mongodb; do
+  install -d $i -o mongodb -g mongodb -m 770
+done
--- a/sql/mongodb/DETAILS
+++ b/sql/mongodb/DETAILS
@@ -1,18 +1,15 @@
           MODULE=mongodb
-         VERSION=2.2.3
+         VERSION=2.4.2
           SOURCE=$MODULE-src-r$VERSION.tar.gz
          SOURCE2=mongodb.conf-0.3
-         SOURCE3=mongodb-2.x-SConscript.client.patch
       SOURCE_URL=http://downloads.mongodb.org/src
      SOURCE2_URL=$PATCH_URL
-     SOURCE3_URL=$PATCH_URL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-src-r$VERSION
-      SOURCE_VFY=sha256:dd292c73f8182eb201ae4dd4bd7132c79c56247a7bc4fcde9d09a5bc6c74978d
+      SOURCE_VFY=sha256:d0a26fef7f425a6652ebfc3addbc7e1b01a10be65c9d68e464730687bd6721c3
      SOURCE2_VFY=sha256:29e47681c4a9325a8288e3f5c3591138f08bce36178c21a0a4b41bf4b05922dc
-     SOURCE3_VFY=sha256:ca00fedc9f87bc3e013a2d4345fc125b22d614e111cc11c233f544940574c058
         WEB_SITE=http://www.mongodb.org/
          ENTERED=20101205
-         UPDATED=20130202
+         UPDATED=20130421
            SHORT="A scalable, high-performance, key-value store, document-oriented database"
 cat << EOF
 MongoDB bridges the gap between key-value stores (which are fast and