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

Felix Yan felixonmars at archlinux.org
Tue Jan 3 10:38:04 UTC 2017


    Date: Tuesday, January 3, 2017 @ 10:38:04
  Author: felixonmars
Revision: 204769

upgpkg: mongodb 3.4.1-1

Modified:
  mongodb/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-03 09:36:53 UTC (rev 204768)
+++ PKGBUILD	2017-01-03 10:38:04 UTC (rev 204769)
@@ -9,11 +9,10 @@
 pkgver=3.4.1
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='http://www.mongodb.org'
 license=('AGPL3')
-depends=('pcre' 'snappy' 'openssl' 'libsasl' 'boost-libs' 'yaml-cpp')
-[[ "$CARCH" == "x86_64" ]] && depends+=('wiredtiger')
+depends=('pcre' 'snappy' 'openssl' 'libsasl' 'boost-libs' 'yaml-cpp' 'lsb-release' 'wiredtiger')
 makedepends=('scons' 'readline' 'ncurses' 'libpcap' 'boost')
 checkdepends=('python2-pymongo' 'python2-yaml')
 optdepends=('libpcap: needed for mongosniff'
@@ -33,6 +32,7 @@
   --use-system-snappy
   --use-system-yaml
   --use-system-zlib
+  --use-system-wiredtiger
   --use-sasl-client
   --ssl
   --disable-warnings-as-errors
@@ -41,13 +41,6 @@
   # --use-system-tcmalloc # Disabled as upstream suggests in https://jira.mongodb.org/browse/SERVER-17447?focusedCommentId=841890&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-841890
 )
 
-if [ "$CARCH" == "x86_64" ]; then
-  _scons_args+=(--use-system-wiredtiger)
-else
-  # WiredTiger must be disabled manually when building for i686
-  _scons_args+=(--wiredtiger=off)
-fi
-
 prepare() {
   cd mongodb-src-r${pkgver}
   patch -Np1 -i ../mongodb-3.2.10-boost-1.62.0.patch
@@ -71,18 +64,11 @@
   scons unittests "${_scons_args[@]}"
   LANG=en_US.UTF-8 python2 buildscripts/resmoke.py --suites=unittests
 
-  # Specifying --storageEngine is needed for i686
-  if [ "$CARCH" == "i686" ]; then
-    _storageEngine="--storageEngine=mmapv1"
-  else
-    _storageEngine=""
-  fi
-
   scons dbtest "${_scons_args[@]}"
-  python2 buildscripts/resmoke.py --suites=dbtest $_storageEngine
+  python2 buildscripts/resmoke.py --suites=dbtest
 
   scons integration_tests "${_scons_args[@]}"
-  python2 buildscripts/resmoke.py --suites=integration_tests_replset,integration_tests_standalone --dbpathPrefix="$srcdir" $_storageEngine
+  python2 buildscripts/resmoke.py --suites=integration_tests_replset,integration_tests_standalone --dbpathPrefix="$srcdir"
 }
 
 package() {



More information about the arch-commits mailing list