summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2011-07-02 21:53:14 +0400
committerVlad Glagolev2011-07-02 21:53:14 +0400
commitce45746fe1a26a7861a8c54f56d4d5ba150898b8 (patch)
treeb74358af203bde0c656d6f6d083b05c9cc0c86ea
parent84b54cf611f6c0b24ec17bcffd5d7fce363cc9e5 (diff)
mongodb: => 1.8.2
-rwxr-xr-xdatabase/mongodb/DETAILS4
-rw-r--r--database/mongodb/HISTORY8
-rwxr-xr-xdatabase/mongodb/PRE_BUILD1
-rw-r--r--database/mongodb/scons.patch10
-rw-r--r--database/mongodb/sm185.patch.bz2bin0 -> 7953 bytes
5 files changed, 16 insertions, 7 deletions
diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index 14c20e998e..c0772cbe37 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,8 +1,8 @@
SPELL=mongodb
- VERSION=1.8.1
+ VERSION=1.8.2
SOURCE=$SPELL-src-r$VERSION.tar.gz
SOURCE_URL[0]=http://downloads.mongodb.org/src/$SOURCE
- SOURCE_HASH=sha512:6b48c33971f8729b3a85daf884e0628a402496a0a654a83ea9d9922c5afa668410336ca1b456b20f959e8719b4b3ad69c8bc165b3aa138b39a091532180232a6
+ SOURCE_HASH=sha512:0a0baca37854e4ed351daa0a1b75e3ff2a3773c66deba211e47b4c3cc9ef793c053da42f4ccf7636bc20565259bdacef8e0d8b47f3bc034f94ed88fed58be03d
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 4a39387f6b..d4ccdcb8ac 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,5 +1,11 @@
+2011-07-02 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.8.2
+ * PRE_BUILD: apply the patch
+ * sm185.patch.bz2: added, to fix functionality with spidermonkey 1.8.5
+ * scons.patch: pass warnings
+
2011-06-05 Vlad Glagolev <stealth@sourcemage.org>
- * DETAILS: updated spell to 1.8.1
+ * DETAILS: updated spell to 1.8.1
2011-03-17 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.8.0
diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index 363de0486c..da81106e8d 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -2,5 +2,6 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
patch -p0 < "$SPELL_DIRECTORY/scons.patch" &&
+bzcat "$SPELL_DIRECTORY/sm185.patch.bz2" | patch -p0 &&
sed -i "s:lib64:lib:g" SConstruct
diff --git a/database/mongodb/scons.patch b/database/mongodb/scons.patch
index 6b88a73215..2f1c698d86 100644
--- a/database/mongodb/scons.patch
+++ b/database/mongodb/scons.patch
@@ -1,8 +1,10 @@
---- SConstruct.orig 2011-03-16 18:33:30.000000000 +0300
-+++ SConstruct 2011-03-17 12:56:26.070001337 +0300
-@@ -673,6 +673,7 @@
+--- 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=" -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 " )
diff --git a/database/mongodb/sm185.patch.bz2 b/database/mongodb/sm185.patch.bz2
new file mode 100644
index 0000000000..c989d3c86d
--- /dev/null
+++ b/database/mongodb/sm185.patch.bz2
Binary files differ