Merge pull request #14731 from layus/fix-mongo

mongodb: forget references to build inputs
This commit is contained in:
Tuomas Tynkkynen 2016-04-15 23:03:30 +03:00
commit b48172ea72
2 changed files with 28 additions and 5 deletions

@ -49,12 +49,18 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ scons ];
inherit buildInputs;
# When not building with the system valgrind, the build should use the
# vendored header file - regardless of whether or not we're using the system
# tcmalloc - so we need to lift the include path manipulation out of the
# conditional.
patches =
[ ./valgrind-include.patch
[
# When not building with the system valgrind, the build should use the
# vendored header file - regardless of whether or not we're using the system
# tcmalloc - so we need to lift the include path manipulation out of the
# conditional.
./valgrind-include.patch
# MongoDB keeps track of its build parameters, which tricks nix into
# keeping dependencies to build inputs in the final output.
# We remove the build flags from buildInfo data.
./forget-build-dependencies.patch
(fetchpatch {
url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/boost160.patch?h=packages/mongodb;
name = "boost160.patch";

@ -0,0 +1,17 @@
--- a/site_scons/mongo_scons_utils.py
+++ b/site_scons/mongo_scons_utils.py
@@ -84,14 +84,11 @@
def default_buildinfo_environment_data():
return (
('distmod', '$MONGO_DISTMOD', True, True,),
('distarch', '$MONGO_DISTARCH', True, True,),
('cc', '$CC_VERSION', True, False,),
- ('ccflags', '$CCFLAGS', True, False,),
('cxx', '$CXX_VERSION', True, False,),
- ('cxxflags', '$CXXFLAGS', True, False,),
- ('linkflags', '$LINKFLAGS', True, False,),
('target_arch', '$TARGET_ARCH', True, True,),
('target_os', '$TARGET_OS', True, False,),
)
# If you want buildInfo and --version to be relatively empty, set