Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0202740af55f54cdfb1fb7b9c70213f55fe5f957)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0202740af55f54cdfb1fb7b9c70213f55fe5f957)
  • Date: Wed, 14 Sep 2011 05:25:11 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

database/mongodb/BUILD | 3 +++
database/mongodb/DEPENDS | 11 +++--------
database/mongodb/DETAILS | 4 ++--
database/mongodb/HISTORY | 10 ++++++++++
database/mongodb/PRE_BUILD | 5 ++---
database/mongodb/jsscan.patch | 10 ++++++++++
database/mongodb/scons.patch | 21 ---------------------
database/mongodb/sm185.patch.bz2 | 0
dev/null |binary
9 files changed, 30 insertions(+), 34 deletions(-)

New commits:
commit 0202740af55f54cdfb1fb7b9c70213f55fe5f957
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mongodb: => 2.0.0

diff --git a/database/mongodb/BUILD b/database/mongodb/BUILD
index a10f43f..2b10b63 100755
--- a/database/mongodb/BUILD
+++ b/database/mongodb/BUILD
@@ -1,3 +1,6 @@
create_account mongodb &&

+# use bundled spidermonkey, 2.2 will switch to V8
+OPTS="--sharedclient --usesm $OPTS" &&
+
scons --jobs=$MAKE_NJOBS --prefix="$INSTALL_ROOT/usr" $OPTS
diff --git a/database/mongodb/DEPENDS b/database/mongodb/DEPENDS
index 24d9947..0dd5739 100755
--- a/database/mongodb/DEPENDS
+++ b/database/mongodb/DEPENDS
@@ -1,12 +1,7 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
depends -sub CXX gcc &&
depends scons &&
depends readline &&
-depends spidermonkey '--usesm' &&
-
-if spell_ok spidermonkey && is_version_less $(installed_version
spidermonkey) 1.8.5; then
- force_depends spidermonkey
-fi &&
+depends -sub "THREAD FILESYSTEM PROGRAM_OPTIONS" boost &&

-depends -sub "THREAD FILESYSTEM PROGRAM_OPTIONS" boost
+optional_depends openssl "--ssl" "" "for OpenSSL support" &&
+optional_depends distcc "--distcc" "" "to use distcc for distributing builds"
diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index cd4ba88..a395948 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,8 +1,8 @@
SPELL=mongodb
- VERSION=1.8.3
+ VERSION=2.0.0
SOURCE=$SPELL-src-r$VERSION.tar.gz
SOURCE_URL[0]=http://downloads.mongodb.org/src/$SOURCE
-
SOURCE_HASH=sha512:82c5844b4d38b8aeff33fc4e52a7ba3d8fa83ef10cf92114bd2101e13962f042f0e5fd63da052d1b9e952dc024deead73b179737e82d67fd97839b04b38ce43f
+
SOURCE_HASH=sha512:51d8d13c64a37c8b0a51682cd387f8cea7f8e037fbf3f5ff403cb6b615d6e9335fc9e3cd6d3ad1f229cf558a12c39069991b2f3951ef214e82ef4e1522d8e9eb
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
LICENSE[0]=AGPL
LICENSE[1]=APACHE
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index e625691..de57dbb 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,13 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.0
+ * DEPENDS: added optional dependencies, spidermonkey is included in
+ distribution now
+ * BUILD: moved '--usesm' flag here
+ * PRE_BUILD: apply the patch, take CXXFLAGS from env var
+ * jsscan.patch: added, to fix compilation with non-needed header
+ * scons.patch: removed, replaced with sed in PRE_BUILD
+ * sm185.patch.bz2: removed, not needed anymore
+
2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.3
* DEPENDS: check spidermonkey version
diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index da81106..bf67a0f 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -1,7 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/scons.patch" &&
-bzcat "$SPELL_DIRECTORY/sm185.patch.bz2" | patch -p0 &&
+patch -p0 < "$SPELL_DIRECTORY/jsscan.patch" &&

-sed -i "s:lib64:lib:g" SConstruct
+sed -i "s:\" -O3 \":os.environ['CXXFLAGS']:;s:lib64:lib:g" SConstruct
diff --git a/database/mongodb/jsscan.patch b/database/mongodb/jsscan.patch
new file mode 100644
index 0000000..b44e0b4
--- /dev/null
+++ b/database/mongodb/jsscan.patch
@@ -0,0 +1,10 @@
+--- third_party/js-1.7/jsscan.c.orig 2011-09-14 12:36:51.000000000 +0400
++++ third_party/js-1.7/jsscan.c 2011-09-14 12:39:38.920064658 +0400
+@@ -109,7 +109,6 @@
+ #define JSKW_GOT_MATCH(index) i = (index); goto got_match;
+ #define JSKW_TEST_GUESS(index) i = (index); goto test_guess;
+ #define JSKW_NO_MATCH() goto no_match;
+-#include "jsautokw.h"
+ #undef JSKW_NO_MATCH
+ #undef JSKW_TEST_GUESS
+ #undef JSKW_GOT_MATCH
diff --git a/database/mongodb/scons.patch b/database/mongodb/scons.patch
deleted file mode 100644
index 2f1c698..0000000
--- a/database/mongodb/scons.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- SConstruct.orig
-+++ SConstruct
-@@ -671,8 +671,8 @@
- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall
-Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- if linux:
-- env.Append( CPPFLAGS=" -Werror " )
- env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is
faster than gcc's
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
- env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
- env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
- env.Append( LIBS=[] )
-@@ -688,7 +688,7 @@
- env.Append( CPPFLAGS=" -O0 -fstack-protector " );
- env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
- else:
-- env.Append( CPPFLAGS=" -O3" )
-+ pass
- #env.Append( CPPFLAGS=" -fprofile-generate" )
- #env.Append( LINKFLAGS=" -fprofile-generate" )
- # then:
diff --git a/database/mongodb/sm185.patch.bz2
b/database/mongodb/sm185.patch.bz2
deleted file mode 100644
index c989d3c..0000000
Binary files a/database/mongodb/sm185.patch.bz2 and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0202740af55f54cdfb1fb7b9c70213f55fe5f957), Vlad Glagolev, 09/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page