diff options
author | joerg <joerg> | 2015-05-05 15:54:49 +0000 |
---|---|---|
committer | joerg <joerg> | 2015-05-05 15:54:49 +0000 |
commit | ab8ab6c16eecd0376fd135a6ede4b93c24ea671a (patch) | |
tree | 60fc272794c311c5dbafc8b876d677ed0a45749c /databases | |
parent | 1caab4acf9b891d2386b97893de251c08a61846b (diff) | |
download | pkgsrc-ab8ab6c16eecd0376fd135a6ede4b93c24ea671a.tar.gz |
Fix missing include for free(3). Preserve our environment.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/mongodb/distinfo | 5 | ||||
-rw-r--r-- | databases/mongodb/patches/patch-SConstruct | 28 | ||||
-rw-r--r-- | databases/mongodb/patches/patch-src_mongo_util_intrusive__counter.h | 12 |
3 files changed, 33 insertions, 12 deletions
diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo index 5cf92ed59b6..f13e112bc63 100644 --- a/databases/mongodb/distinfo +++ b/databases/mongodb/distinfo @@ -1,14 +1,15 @@ -$NetBSD: distinfo,v 1.1 2015/05/02 08:10:33 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2015/05/05 15:54:49 joerg Exp $ SHA1 (mongodb-src-r3.0.2.tar.gz) = c24c4deb619e199d5c3688370b39ea6e4a4df204 RMD160 (mongodb-src-r3.0.2.tar.gz) = 12571664adca8bcec7fe8daa6ee2a8a120261aea Size (mongodb-src-r3.0.2.tar.gz) = 26594777 bytes -SHA1 (patch-SConstruct) = 656921b86b686c0dd2005036629d0149d6f713e7 +SHA1 (patch-SConstruct) = 71f06ac82474f81a6b1b6660cd9e23cd5a63d55f SHA1 (patch-debian_mongod.conf) = 35f3d7e7da4f573458bef0fe742c1790adec8200 SHA1 (patch-src_mongo_base_initializer.h) = add32c5940c922a98122d0e6883eb3ad52dc25c5 SHA1 (patch-src_mongo_db_repl_isself.c) = 93001bf0616c0fd64ac5e7ea03113885671540b0 SHA1 (patch-src_mongo_platform_random.cpp) = ab275e90347a9d2e767f031df4e56a204647ddfe SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = d505c22aeeee09b482bf3d3a6bd0cdc45c9ec0bc +SHA1 (patch-src_mongo_util_intrusive__counter.h) = d242db05708c999bd19f2751bdc881db50ea81f0 SHA1 (patch-src_third__party_s2_base_port.h) = 8e715efbfcacaba51d957c21aa32ccfd3cc4f736 SHA1 (patch-src_third__party_v8-3.25_SConscript) = a8da59130c36b2be3b89498ba0b23b1c7c9ab9e6 SHA1 (patch-src_third__party_v8-3.25_src_platform-posix.cc) = 2fa27016a9af828d1c01815739770918a2d53d16 diff --git a/databases/mongodb/patches/patch-SConstruct b/databases/mongodb/patches/patch-SConstruct index 03c5ebe5e69..7cfe02b6d69 100644 --- a/databases/mongodb/patches/patch-SConstruct +++ b/databases/mongodb/patches/patch-SConstruct @@ -1,4 +1,4 @@ -$NetBSD: patch-SConstruct,v 1.1 2015/05/02 08:10:33 ryoon Exp $ +$NetBSD: patch-SConstruct,v 1.2 2015/05/05 15:54:49 joerg Exp $ Add support for NetBSD/Dragonfly, fix locations. --- SConstruct.orig 2015-04-08 20:28:08.000000000 +0000 @@ -26,33 +26,41 @@ Add support for NetBSD/Dragonfly, fix locations. elif platform.startswith( "openbsd" ): openbsd = True elif "win32" == platform: -@@ -848,6 +854,12 @@ elif solaris: +@@ -571,6 +577,7 @@ envDict = dict(BUILD_ROOT=buildDir, + CONFIGUREDIR=sconsDataDir.Dir('sconf_temp'), + CONFIGURELOG=sconsDataDir.File('config.log'), + INSTALL_DIR=installDir, ++ ENV = os.environ + ) + + if windows: +@@ -848,6 +855,12 @@ elif solaris: env.Append( CPPDEFINES=[ "__sunos__" ] ) env.Append( LIBS=["socket","resolv","lgrp"] ) +elif os.sys.platform.startswith( "dragonfly" ): -+ env.Append( CPPPATH=[ "@PREFIX@/include" ] ) -+ env.Append( LIBPATH=[ "@PREFIX@/lib" ] ) ++ env.Append( CPPPATH=[ "/usr/pkg/include" ] ) ++ env.Append( LIBPATH=[ "/usr/pkg/lib" ] ) + env.Append( LIBS=[ "m" ] ) + env.Append( CPPDEFINES=[ "__dragonfly__" ] ) + elif freebsd: env.Append( LIBS=[ "kvm" ] ) env.Append( EXTRACPPPATH=[ "/usr/local/include" ] ) -@@ -855,6 +867,12 @@ elif freebsd: +@@ -855,6 +868,12 @@ elif freebsd: env.Append( CPPDEFINES=[ "__freebsd__" ] ) env.Append( CCFLAGS=[ "-fno-omit-frame-pointer" ] ) +elif os.sys.platform.startswith( "netbsd" ): -+ env.Append( CPPPATH=[ "@PREFIX@/include" ] ) -+ env.Append( LIBPATH=[ "@PREFIX@/lib" ] ) ++ env.Append( CPPPATH=[ "/usr/pkg/include" ] ) ++ env.Append( LIBPATH=[ "/usr/pkg/lib" ] ) + env.Append( LIBS=[ "m" ] ) + env.Append( CPPDEFINES=[ "__netbsd__" ] ) + elif openbsd: env.Append( EXTRACPPPATH=[ "/usr/local/include" ] ) env.Append( EXTRALIBPATH=[ "/usr/local/lib" ] ) -@@ -1020,8 +1038,11 @@ if nix: +@@ -1020,8 +1039,11 @@ if nix: env.Append( CCFLAGS=["-Werror"] ) env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) @@ -64,7 +72,7 @@ Add support for NetBSD/Dragonfly, fix locations. # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program # startup. -@@ -2163,7 +2184,7 @@ def doConfigure(myenv): +@@ -2163,7 +2185,7 @@ def doConfigure(myenv): Exit(1) # requires ports devel/libexecinfo to be installed @@ -73,7 +81,7 @@ Add support for NetBSD/Dragonfly, fix locations. if not conf.CheckLib("execinfo"): print("Cannot find libexecinfo, please install devel/libexecinfo.") Exit(1) -@@ -2409,7 +2430,7 @@ Export("mongoCodeVersion") +@@ -2409,7 +2431,7 @@ Export("mongoCodeVersion") Export("usev8") Export("v8version v8suffix") Export("boostSuffix") diff --git a/databases/mongodb/patches/patch-src_mongo_util_intrusive__counter.h b/databases/mongodb/patches/patch-src_mongo_util_intrusive__counter.h new file mode 100644 index 00000000000..6a4320b99c0 --- /dev/null +++ b/databases/mongodb/patches/patch-src_mongo_util_intrusive__counter.h @@ -0,0 +1,12 @@ +$NetBSD: patch-src_mongo_util_intrusive__counter.h,v 1.1 2015/05/05 15:54:49 joerg Exp $ + +--- src/mongo/util/intrusive_counter.h.orig 2015-05-05 12:50:27.000000000 +0000 ++++ src/mongo/util/intrusive_counter.h +@@ -28,6 +28,7 @@ + + #pragma once + ++#include <cstdlib> + #include <boost/intrusive_ptr.hpp> + #include <boost/noncopyable.hpp> + #include "mongo/platform/atomic_word.h" |