[arch-commits] Commit in mongodb/trunk (2 files)
Felix Yan
fyan at archlinux.org
Thu Dec 10 18:23:30 UTC 2015
Date: Thursday, December 10, 2015 @ 19:23:29
Author: fyan
Revision: 152525
upgpkg: mongodb 3.2.0-1
Modified:
mongodb/trunk/PKGBUILD
Deleted:
mongodb/trunk/fix-compile-error-in-clang-with-m32-and-64.patch
--------------------------------------------------+
PKGBUILD | 77 ++++++++++-----------
fix-compile-error-in-clang-with-m32-and-64.patch | 26 -------
2 files changed, 39 insertions(+), 64 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-12-10 18:23:14 UTC (rev 152524)
+++ PKGBUILD 2015-12-10 18:23:29 UTC (rev 152525)
@@ -6,14 +6,15 @@
# Contributor: Alec Thomas
pkgname=mongodb
-pkgver=3.0.7
-pkgrel=3
+pkgver=3.2.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=('pcre' 'snappy' 'openssl' 'libsasl' 'boost-libs') # 'libyaml' 'yaml-cpp' 'v8' 'gperftools')
-makedepends=('scons' 'readline' 'ncurses' 'libpcap' 'boost' 'clang')
+depends=('pcre' 'snappy' 'openssl' 'libsasl' 'boost-libs' 'yaml-cpp')
+[[ "$CARCH" == "x86_64" ]] && depends+=('wiredtiger')
+makedepends=('scons' 'readline' 'ncurses' 'libpcap' 'boost')
checkdepends=('python2-pymongo' 'python2-yaml')
optdepends=('libpcap: needed for mongosniff'
'mongodb-tools: mongoimport, mongodump, mongotop, etc')
@@ -20,69 +21,69 @@
backup=('etc/mongodb.conf')
install=mongodb.install
source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
- 'fix-compile-error-in-clang-with-m32-and-64.patch'
'mongodb.conf' 'mongodb.service')
-sha512sums=('183691c5dc137ea4b86d53d24d2935fd66ed8de60fbf5eca0a0a39c159be1f29043cd655cde1a213a98a76b2b3e6369dbccf790b02a1cc4b622c067ad3c0c91b'
- '94e5b61a81eb3d907f34430cec1fb3bccc2ee5730c8dd33d00adb26fc144b672e605516cc2a83c4ca4aad2a9d67643fa42dd8c6fe4f1f07e1336901cc17ea9ec'
+sha512sums=('4b321b582f5ec2613b869b003a02494c8a9e3b772b1f13898417b1e831c204468309a0e1785acd3b85c8a663cae91e55e44f53f8b74bd3a516b1e1471f606882'
'05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
'177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9')
-prepare() {
- cd mongodb-src-r${pkgver}
-
- # https://jira.mongodb.org/browse/SERVER-17461
- # https://github.com/gperftools/gperftools/commit/772a686c4545
- patch -d src/third_party/gperftools-2.2 -Np1 <../fix-compile-error-in-clang-with-m32-and-64.patch
-}
-
_scons_args=(
+ --use-system-boost
--use-system-pcre
--use-system-snappy
+ --use-system-yaml
+ --use-system-zlib
--use-sasl-client
- --use-system-boost
- --variant-dir=build
--ssl
- --c++11=on
--disable-warnings-as-errors
- --cc=clang --cxx=clang++
- LIBS=atomic
+ # --use-system-asio # https://jira.mongodb.org/browse/SERVER-21839
+ # --use-system-v8 # Doesn't compile
+ # --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
)
-# --use-system-v8 (Doesn't compile)
-# --use-system-yaml (Doesn't compile)
-# --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)
-# LIBS=atomic is a workaround for https://jira.mongodb.org/browse/SERVER-17447
-build() {
+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}
export SCONSFLAGS="$MAKEFLAGS"
+}
+build() {
cd mongodb-src-r${pkgver}
- scons all "${_scons_args[@]}"
+ scons core tools "${_scons_args[@]}"
}
check() {
- # All tests disabled for 3.0.7
+ cd mongodb-src-r${pkgver}
- export SCONSFLAGS="$MAKEFLAGS"
+ # Setting LANG to workaround the following test error:
+ # std::exception: locale::facet::_S_create_c_locale name not valid
+ scons unittests "${_scons_args[@]}"
+ LANG=en_US.UTF-8 python2 buildscripts/resmoke.py --suites=unittests
- cd mongodb-src-r${pkgver}
+ # Specifying --storageEngine is needed for i686
+ if [ "$CARCH" == "i686" ]; then
+ _storageEngine="--storageEngine=mmapv1"
+ else
+ _storageEngine=""
+ fi
- # TODO: jstests
- # python2 buildscripts/resmoke.py --dbpathPrefix="$srcdir"
-
scons dbtest "${_scons_args[@]}"
- # python2 buildscripts/resmoke.py --set suite dbtest
+ python2 buildscripts/resmoke.py --suites=dbtest $_storageEngine
- scons unittests "${_scons_args[@]}"
- # python2 buildscripts/resmoke.py --set suite unittests
+ scons integration_tests "${_scons_args[@]}"
+ python2 buildscripts/resmoke.py --suites=integration_tests_replset,integration_tests_standalone --dbpathPrefix="$srcdir" $_storageEngine
}
package() {
- export SCONSFLAGS="$MAKEFLAGS"
-
cd mongodb-src-r${pkgver}
- scons install --prefix="$pkgdir/usr" "${_scons_args[@]}"
+ scons install --prefix="$pkgdir/usr" --nostrip "${_scons_args[@]}"
install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf"
install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service"
Deleted: fix-compile-error-in-clang-with-m32-and-64.patch
===================================================================
--- fix-compile-error-in-clang-with-m32-and-64.patch 2015-12-10 18:23:14 UTC (rev 152524)
+++ fix-compile-error-in-clang-with-m32-and-64.patch 2015-12-10 18:23:29 UTC (rev 152525)
@@ -1,26 +0,0 @@
-From 772a686c45455893708178d3b59b1d3b571015aa Mon Sep 17 00:00:00 2001
-From: Aliaksey Kandratsenka <alk at tut.by>
-Date: Sun, 3 May 2015 13:15:16 -0700
-Subject: [PATCH] issue-683: fix compile error in clang with -m32 and 64-bit
- off_t
-
----
- src/malloc_hook_mmap_linux.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h
-index 8e5a3b0..0f531db 100755
---- a/src/malloc_hook_mmap_linux.h
-+++ b/src/malloc_hook_mmap_linux.h
-@@ -105,7 +105,7 @@ static inline void* do_mmap64(void *start, size_t length,
- // Fall back to old 32-bit offset mmap() call
- // Old syscall interface cannot handle six args, so pass in an array
- int32 args[6] = { (int32) start, (int32) length, prot, flags, fd,
-- (off_t) offset };
-+ (int32)(off_t) offset };
- result = (void *)syscall(SYS_mmap, args);
- }
- #else
---
-2.5.2
-
More information about the arch-commits
mailing list