[arch-commits] Commit in mongodb/trunk (PKGBUILD removeWerror.patch)

[Felix Yan]

    Date: Thursday, April 10, 2014 @ 09:45:33
  Author: fyan
Revision: 109069

upgpkg: mongodb 2.6.0-1

- new major release, no c++ driver since this version

Modified:
  mongodb/trunk/PKGBUILD
  mongodb/trunk/removeWerror.patch

--------------------+
 PKGBUILD           |   19 +++++++++----------
 removeWerror.patch |   22 ++++++----------------
 2 files changed, 15 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-10 04:03:04 UTC (rev 109068)
+++ PKGBUILD	2014-04-10 07:45:33 UTC (rev 109069)
@@ -6,13 +6,13 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.4.10
+pkgver=2.6.0
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
 license=('AGPL3')
-depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') # 'libsasl')
+depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools' 'libsasl') # 'libyaml' 'yaml-cpp' 'v8')
 makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap')
 checkdepends=('python2-pymongo')
 optdepends=('libpcap: needed for mongosniff')
@@ -35,9 +35,9 @@
     --use-system-pcre \
     --use-system-snappy \
     --use-system-tcmalloc \
-    --ssl \
-    --sharedclient
-    # --use-sasl-client
+    --use-sasl-client \
+    --ssl
+    # --use-system-yaml
     # --use-system-v8
 }
 
@@ -60,11 +60,10 @@
     --use-system-pcre \
     --use-system-snappy \
     --use-system-tcmalloc \
+    --use-sasl-client \
     --ssl \
-    --sharedclient \
-    --full \
     --prefix="$pkgdir/usr"
-    # --use-sasl-client
+    # --use-system-yaml
     # --use-system-v8
 
   install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf"
@@ -73,7 +72,7 @@
   install -dm755 "$pkgdir/var/log/mongodb"
 }
 
-sha512sums=('970364dda2dba18bf979a0fc8291d9656b3cc3ba0aec1ca26d81f14f833e355c023d19b3cfaa81704013bf2c0e732d72de08b0f8236dafe85a3ac4d51b87edc6'
+sha512sums=('60747ebd2fce9cffdb6b5ea3472a4efa46cd7e1ee38aee2a806a15667b5d86a61da89bf176876553ab348c0f3b3b925125921330b333a8349275e6ce79ccd337'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
-            'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84')
+            'SKIP')

Modified: removeWerror.patch
===================================================================
--- removeWerror.patch	2014-04-10 04:03:04 UTC (rev 109068)
+++ removeWerror.patch	2014-04-10 07:45:33 UTC (rev 109069)
@@ -1,21 +1,11 @@
---- a/SConstruct	2013-03-16 02:59:55.000000000 +0800
-+++ b/SConstruct	2013-03-20 10:55:20.009645869 +0800
-@@ -692,7 +692,7 @@
+--- a/SConstruct	2014-04-08 22:55:57.206075327 +0800
++++ b/SConstruct	2014-04-08 22:57:58.692240224 +0800
+@@ -819,7 +819,7 @@
                           "-Winvalid-pch"] )
      # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux:
+     if linux or darwin:
 -        env.Append( CCFLAGS=["-Werror", "-pipe"] )
 +        env.Append( CCFLAGS=["-pipe"] )
-         if not has_option('clang'):
-             env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
  
---- a/src/third_party/v8/SConscript	2013-04-17 03:21:23.000000000 +0800
-+++ b/src/third_party/v8/SConscript	2013-04-18 17:41:29.878618892 +0800
-@@ -47,7 +47,6 @@
-   'gcc': {
-     'all': {
-       'CCFLAGS':      ['-Wall',
--                       '-Werror',
-                        '-W',
-                        '-Wno-unused-parameter',
-                        '-Woverloaded-virtual',
+     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
+     env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )