From c69339c7f514d266624ad77e6d977ad0dc88a0b7 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 12 Jan 2016 15:39:57 +0100 Subject: [PATCH] mongodb: fix 32-bit; fix non-musl targets. --- srcpkgs/mongodb/patches/musl-libc_version_h.patch | 4 ++-- srcpkgs/mongodb/template | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mongodb/patches/musl-libc_version_h.patch b/srcpkgs/mongodb/patches/musl-libc_version_h.patch index afabd9e391..e974680512 100644 --- a/srcpkgs/mongodb/patches/musl-libc_version_h.patch +++ b/srcpkgs/mongodb/patches/musl-libc_version_h.patch @@ -29,12 +29,12 @@ BSONObjBuilder bExtra; bExtra.append("versionString", LinuxSysHelper::readLineFromFile("/proc/version")); -#ifdef __UCLIBC__ -+#if defined(__GLIBC__) ++#elif defined(__UCLIBC__) stringstream ss; ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; bExtra.append("libcVersion", ss.str()); -#else -+#elif defined(__UCLIBC__) ++#if defined(__GLIBC__) bExtra.append("libcVersion", gnu_get_libc_version()); #endif if (!verSig.empty()) diff --git a/srcpkgs/mongodb/template b/srcpkgs/mongodb/template index d5ff5c394b..43fcf10768 100644 --- a/srcpkgs/mongodb/template +++ b/srcpkgs/mongodb/template @@ -1,7 +1,7 @@ # Template file for 'mongodb' pkgname=mongodb version=3.2.0 -revision=1 +revision=2 hostmakedepends="scons" makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel gperftools-devel libsasl-devel yaml-cpp-devel valgrind-devel" @@ -28,6 +28,9 @@ _scons_args=" --use-system-boost \ --ssl \ --nostrip \ --disable-warnings-as-errors" +case "$XBPS_TARGET_MACHINE" in + i686*) _scons_args+=" --wiredtiger=off";; +esac # ETOOHUGE nodebug=1