jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mongodb: fix 32-bit; fix non-musl targets.

Browse source
This commit is contained in:
Enno Boland 2016-01-12 15:39:57 +01:00
parent fc5d7b11b0
commit c69339c7f5
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/mongodb/patches/musl-libc_version_h.patch
View file

@ -29,12 +29,12 @@
BSONObjBuilder bExtra; BSONObjBuilder bExtra;
bExtra.append("versionString", LinuxSysHelper::readLineFromFile("/proc/version")); bExtra.append("versionString", LinuxSysHelper::readLineFromFile("/proc/version"));
-#ifdef __UCLIBC__ -#ifdef __UCLIBC__
+#if defined(__GLIBC__) +#elif defined(__UCLIBC__)
stringstream ss; stringstream ss;
ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__;
bExtra.append("libcVersion", ss.str()); bExtra.append("libcVersion", ss.str());
-#else -#else
+#elif defined(__UCLIBC__) +#if defined(__GLIBC__)
bExtra.append("libcVersion", gnu_get_libc_version()); bExtra.append("libcVersion", gnu_get_libc_version());
#endif #endif
if (!verSig.empty()) if (!verSig.empty())

5
srcpkgs/mongodb/template
View file

@ -1,7 +1,7 @@
# Template file for 'mongodb' # Template file for 'mongodb'
pkgname=mongodb pkgname=mongodb
version=3.2.0 version=3.2.0
revision=1 revision=2
hostmakedepends="scons" hostmakedepends="scons"
makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel
gperftools-devel libsasl-devel yaml-cpp-devel valgrind-devel" gperftools-devel libsasl-devel yaml-cpp-devel valgrind-devel"
@ -28,6 +28,9 @@ _scons_args=" --use-system-boost \
--ssl \ --ssl \
--nostrip \ --nostrip \
--disable-warnings-as-errors" --disable-warnings-as-errors"
case "$XBPS_TARGET_MACHINE" in
i686*) _scons_args+=" --wiredtiger=off";;
esac
# ETOOHUGE # ETOOHUGE
nodebug=1 nodebug=1