Changes - j0ke.net Open Build Service

Changes of Revision 7

[-] [+]	Changed	mongodb.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu May 1 19:02:19 UTC 2014 - cs@linux-administrator.com + +- update to release 2.4.10 + +------------------------------------------------------------------- Sat Nov 16 15:20:02 UTC 2013 - cs@linux-administrator.com - update to release 2.4.8
[-] [+]	Changed	mongodb.spec ^
@@ -15,14 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} > 1220 +%bcond_without systemd +%else +%bcond_with systemd +%endif %define _home_dir %{_var}/lib/%{name} %define _mongodb_user %{name} %define _mongodb_group %{name} Name: mongodb -Version: 2.4.8 -Release: 0 +Version: 2.4.14 +Release: 1.13 Url: http://www.mongodb.org Summary: High-performance, schema-free document-oriented database License: AGPL-3.0 and Apache-2.0 @@ -31,12 +36,20 @@ Source1: mongodb.init Source2: mongodb.logrotate Source3: mongodb.conf -Patch0: mongodb-no-werror.patch -Patch1: void_return.patch -# FIX-FOR-UPSTREAM https://jira.mongodb.org/browse/SERVER-5575 - fix the "--full" flag i586 build error. -## Patch2: %{name}-%{version}-mongodb_scons-full-flag.patch +Source4: mongodb.service +Patch0: mongodb-src-r2.4.12-no-werror.patch # FIX-FOR-UPSTREAM openssl 0.9.8 has no FIPS. Patch3: mongodb-ssl-FIPS_mode_set.patch +# add v8 3.14 +Patch4: mongodb_2_4_10_add_v8_3_14.patch.bz2 +Patch5: mongodb_2_4_10_import_v8_3_14_5_JS2C_Python_scripts.patch +Patch6: mongodb_2_4_10_add_js_engine_v8_3_14_option.patch +Patch7: mongodb_2_4_10_update_v8_3_14_to_cid_7d1b8b5.patch.bz2 +# PowerPC specific +Patch8: mongodb_2_4_10_update_v8_3_14_to_ppc_branch_cid_dea1f48.patch +Patch9: mongodb_2_4_10_update_v8_3_14_SConscript_for_ppc.patch +Patch10: mongodb-2.4.11-ppc_patch_based_on_mongo_ibmsoe.patch + BuildRequires: boost-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -50,12 +63,21 @@ #BuildRequires: v8-devel Requires: glibc-locale Requires: logrotate +%if %{with systemd} +BuildRequires: systemd +%{?systemd_requires} +%else Requires(pre): %{fillup_prereq} Requires(pre): %{insserv_prereq} Requires(post): %{insserv_prereq} +%endif Requires(pre): pwdutils BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExcludeArch: ppc ppc64 s390x +%if 0%{?suse_version} >= 1320 +ExcludeArch: s390x ppc +%else +ExcludeArch: s390x ppc ppc64 ppc64le +%endif %description Mongo (from "humongous") is a high-performance, open source, schema-free @@ -89,16 +111,21 @@ %prep %setup -q -n mongodb-src-r%{version} %patch0 -p1 -%if 0%{?suse_version} < 1120 -# strange, maybe, boost::filesystem::remove is void here, and bool later? -%patch1 -p1 -%endif -## ifarch i586 -## patch2 -p1 -## endif %if 0%{?suse_version} <= 1210 %patch3 -p1 %endif +%if 0%{?suse_version} >= 1320 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%ifarch ppc ppc64 ppc64le +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%endif +%endif + # change dbpath sed -i 's\|/data/db/\|%{_home_dir}/\|' src/mongo/db/pdfile.cpp chmod a-x README @@ -106,16 +133,43 @@ %build export CPPFLAGS=$(echo "%{optflags}" \| sed "s\|-Wall\|-Wno-error\|") #NOTE(saschpe): Use "system" allocator, tcmalloc isn't packaged yet: -scons %{?_smp_mflags} --prefix=%{_prefix} --nostrip --full --ssl \ +scons %{?_smp_mflags} \ + --prefix=%{_prefix} \ + --nostrip \ + --sharedclient \ + --full \ + --ssl \ %if 0%{?suse_version} > 1230 --use-system-boost \ %endif - --use-system-pcre + --use-system-pcre \ +%if 0%{?suse_version} >= 1320 + --js-engine=v8-3.14 +%else + --usev8 +%endif + +%ifarch x86_64 +%define mongomovelib 1 +%endif +%ifarch ppc64 ppc64le +%define mongomovelib 1 +%endif %install -scons install --prefix=%{buildroot}%{_prefix} --full +scons install --prefix=%{buildroot}%{_prefix} \ + --nostrip \ + --sharedclient \ +%if 0%{?suse_version} >= 1320 + --js-engine=v8-3.14 \ +%endif + --full install -d -m 0755 \ +%if %{with systemd} + %{buildroot}%{_unitdir} \ +%else %{buildroot}%{_sysconfdir}/init.d \ +%endif %{buildroot}%{_sysconfdir}/logrotate.d \ %{buildroot}%{_bindir} \ %{buildroot}%{_libdir} \ @@ -124,17 +178,22 @@ %{buildroot}%{_localstatedir}/lib/mongodb \ %{buildroot}%{_localstatedir}/log/mongodb mv %{buildroot}%{_bindir}/mongod %{buildroot}%{_sbindir} -install -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name} +%if %{with systemd} +install -p -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service +install -p -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}/rc%{name} +%else +install -p -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name} ln -sf /etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} -install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}.conf -install -m 0644 debian/.1 %{buildroot}%{_mandir}/man1/ -%ifarch x86_64 -mkdir -p %{buildroot}%{_libdir}/ -mv %{buildroot}%{_prefix}/lib/libmongoclient.a %{buildroot}%{_libdir}/ +%endif +install -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}.conf +install -p -m 0644 debian/.1 %{buildroot}%{_mandir}/man1/ +%if 0%{?mongomovelib} +mv %{buildroot}%{_prefix}/lib/libmongoclient.a %{buildroot}%{_libdir} +mv %{buildroot}%{_prefix}/lib/libmongoclient.so %{buildroot}%{_libdir} %endif -find %{buildroot}%{_includedir} -type f -name ".h" -exec chmod -x {} \; \|\| : +find %{buildroot}%{_includedir} -type f -name ".h" -exec chmod -x {} \; %fdupes %{buildroot} %pre @@ -142,18 +201,34 @@ /usr/sbin/useradd -r -g %{_mongodb_group} -c "MongoDB database admin" \ -s /bin/false -d %{_home_dir} %{_mongodb_user} 2> /dev/null \|\| : /usr/sbin/usermod -g %{_mongodb_group} -s /bin/false %{_mongodb_user} \|\| : +%if %{with systemd} +%{service_add_pre %{name}.service} +%endif %post /sbin/ldconfig +%if %{with systemd} +%{service_add_post %{name}.service} +%else %{fillup_and_insserv -f %{name}} +%endif %preun +%if %{with systemd} +%{service_del_preun %{name}.service} +%else %{stop_on_removal %{name}} +%endif
[-] [+]	Added	mongodb-2.4.11-ppc_patch_based_on_mongo_ibmsoe.patch ^
@@ -0,0 +1,2952 @@ +From: Michel Normand <normand@linux.vnet.ibm.com> +Subject: mongodb_2_4_10_ppc_patch_based_on_mongo_ibmsoe +Date: Fri, 06 Feb 2015 17:28:47 +0100 + +This is a step1 patch (without step2 related to src/third_party/v8-3.14) +mongodb_2_4_10_ppc_patch_based_on_mongo_ibmsoe.patch +is the git merge of all commits of r2.4.9-ppc branch applied to r2.4.10-ppc branch + +It has been created as detailed below. +TODO: need to check who is pushing upstream the related change of mongo_ibmsoe +note: gbr, gco and gta are aliases of git commands + +* details of actions to create this patch: + 1_ clone mongo ibmsoe git tree + 2_ identify the commit id 08da87a as base of r2.4.9-ppc branch + 3_ update git tree with last changes of mongodb git tree + with remote add and fetch commands + 4_ identify the commit id e3d7895 associated to 2.4.10 release + create a local r2.4.10-ppc on this same id e3d7895 + 5_ do the git merge of r2.4.9-ppc to r2.4.10-ppc + ultimately use git diff command to create the patch + === 1_ + $git clone https://github.com/ibmsoe/mongo + ... + === 2_ + $gco r2.4.9-ppc + $gbr \|grep \^\* + * r2.4.9-ppc + $git rev-list --boundary $(git rev-parse --abbrev-ref HEAD)...master \| grep ^- \| cut -c2- + 08da87aa68a489dab7f24e059916b1ba2aa33452 + ... + $gta + ... + \| * 3201046 (HEAD, origin/r2.4.9-ppc, origin/HEAD, r2.4.9-ppc) Updated buildin.md + ... + \| * \| \| 3018a05 SERVER-8914: rename document.scanned metric + \|/ / / + * \| \| 08da87a SERVER-8880 Visual Studio -- remove /OPT:REF and /OPT:ICF + ... + \| \| * 52fe0d2 (tag: r2.4.9) BUMP 2.4.9 + \| \| * 3e3734c post 2.4.9-rc0 + === 3_ + $git remote add mongodb https://github.com/mongodb/mongo.git + $git fetch mongodb + $gco v2.4 + $gbr \| grep \^\* + * v2.4 + $git merge mongodb/v2.4 + === 4_ + $gta \|grep 2.4.10 + \| \| \| * d218cd5 post 2.4.10 + \| \| \| * e3d7895 (HEAD, tag: r2.4.10) BUMP 2.4.10 + \| \| \| * e8d714a post 2.4.10-rc0 + \| \| \| * 6c3b955 (tag: r2.4.10-rc0) BUMP 2.4.10-rc0 + \| * \| \| 2e4f101 defensive + $gco -b r2.4.10-ppc e3d7895 + Switched to a new branch 'r2.4.10-ppc' + $gbr \|grep 2.4 + * r2.4.10-ppc + r2.4.9-aixppc + r2.4.9-ppc + v2.4 + v2.4.1 + $gta \|grep r2.4.10.ppc + \| \| \| * e3d7895 (HEAD, tag: r2.4.10, r2.4.10-ppc) BUMP 2.4.10 + === 5_ + $git merge r2.4.9-ppc + $git diff -u --stat r2.4.10 r2.4.10-ppc \| grep -v '^[a-z]' \ + > /tmp/mongodb_2_4_10_ppc_patch_based_on_mongo_ibmsoe.patch + === + +diff --git a/README b/README +index 1d059c6..6e7f5b9 100755 +--- a/README ++++ b/README +@@ -1,3 +1,5 @@ ++Porting 2.4.9 for Power Linux ++ + MongoDB README + + Welcome to MongoDB! +diff --git a/SConstruct b/SConstruct +index ab01a71..548ce8d 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -149,6 +149,7 @@ add_option( "static-libstdc++" , "statically link libstdc++" , 0 , False ) + # base compile flags + add_option( "64" , "whether to force 64 bit" , 0 , True , "force64" ) + add_option( "32" , "whether to force 32 bit" , 0 , True , "force32" ) ++add_option( "31" , "whether to force 31 bit for s390x" , 0 , True , "force31" ) + + add_option( "cxx", "compiler to use" , 1 , True ) + add_option( "cc", "compiler to use for c" , 1 , True ) +@@ -259,6 +260,8 @@ windows = False + freebsd = False + openbsd = False + solaris = False ++bigendian = True # For snappy ++force31 = has_option( "force31" ) + force32 = has_option( "force32" ) + force64 = has_option( "force64" ) + if not force64 and not force32 and os.getcwd().endswith( "mongo-64" ): +@@ -551,6 +554,10 @@ elif os.sys.platform.startswith("linux"): + if has_option( "static-libstdc++" ): + env.Append( LINKFLAGS=" -static-libstdc++ " ) + ++ if os.uname()[4] == "s390x": ++ env.Prepend(CPPDEFINES=[ "_BIG_ENDIAN=1" ] ) ++ env.Prepend(CPPDEFINES=[ "__BIG_ENDIAN__=1" ] ) ++ + elif "sunos5" == os.sys.platform: + nix = True + solaris = True +@@ -706,7 +713,6 @@ if nix: + "-fno-strict-aliasing", + "-ggdb", + "-pthread", +- "-Wall", + "-Wsign-compare", + "-Wno-unknown-pragmas", + "-Winvalid-pch"] ) +@@ -751,6 +757,10 @@ if nix: + env.Append( CCFLAGS="-m32" ) + env.Append( LINKFLAGS="-m32" ) + ++ if force31: ++ env.Append( CCFLAGS="-m31" ) ++ env.Append( LINKFLAGS="-m31" ) ++ + if has_option( "gdbserver" ): + env.Append( CPPDEFINES=["USE_GDBSERVER"] ) + +@@ -872,6 +882,9 @@ def doConfigure(myenv): + if not conf.CheckLib("execinfo"): + Exit(1) + ++ #hcj added for snappy ++ Export( "bigendian" ) ++ + # 'tcmalloc' needs to be the last library linked. Please, add new libraries before this + # point. + if get_option('allocator') == 'tcmalloc': +diff --git a/docs/building.md b/docs/building.md +index 13aa4f9..db9db93 100644 +--- a/docs/building.md ++++ b/docs/building.md +@@ -36,6 +36,13 @@ COMPILER VERSIONS + Mongo has been tested with GCC 4.x and Visual Studio 2008 and 2010. Older versions + of GCC may not be happy. + ++LINUX ON POWER ++-------------- ++ ++To build MongoDB for Linux on IBM Power Systems, you need to install v8 separately (it can be downloaded from https://github.com/andrewlow/v8ppc ). Then run the following: ++ ++ $ scons all -j4 --sharedclient=SHAREDCLIENT --use-system-tcmalloc --use-system-v8 --prefix=/usr/lib --extrapath=/lib --usev8 --nostrip --ssl --full ++ + WINDOWS + -------------- + +diff --git a/src/mongo/bson/bson-inl.h b/src/mongo/bson/bson-inl.h +index dfe7568..fac190b 100644 +--- a/src/mongo/bson/bson-inl.h ++++ b/src/mongo/bson/bson-inl.h +@@ -186,7 +186,7 @@ dodouble: + + inline BSONObj BSONElement::codeWScopeObject() const { + verify( type() == CodeWScope ); +- int strSizeWNull = (int )( value() + 4 ); ++ int strSizeWNull = little<int>::ref( value() + 4 ); + return BSONObj( value() + 4 + 4 + strSizeWNull ); + } + +@@ -511,15 +511,15 @@ dodouble: + break; + } + case CodeWScope: { +- int totalSize = ( int )( value() ); ++ int totalSize = little<int>::ref( value() ); + massert( 10322 , "Invalid CodeWScope size", totalSize >= 8 ); +- int strSizeWNull = ( int )( value() + 4 ); ++ int strSizeWNull = little<int>::ref( value() + 4 ); + massert( 10323 , "Invalid CodeWScope string size", totalSize >= strSizeWNull + 4 + 4 ); + massert( 10324 , "Invalid CodeWScope string size", + strSizeWNull > 0 && + (strSizeWNull - 1) == mongo::strnlen( codeWScopeCode(), strSizeWNull ) ); + massert( 10325 , "Invalid CodeWScope size", totalSize >= strSizeWNull + 4 + 4 + 4 ); +- int objSize = ( int )( value() + 4 + 4 + strSizeWNull ); ++ int objSize = little<int>::ref( value() + 4 + 4 + strSizeWNull ); + massert( 10326 , "Invalid CodeWScope object size", totalSize == 4 + 4 + strSizeWNull + objSize ); + // Subobject validation handled elsewhere. + } +diff --git a/src/mongo/bson/bson_db.h b/src/mongo/bson/bson_db.h +index c421816..2cecd5a 100644 +--- a/src/mongo/bson/bson_db.h ++++ b/src/mongo/bson/bson_db.h +@@ -49,7 +49,7 @@ namespace mongo { + + inline OpTime BSONElement::_opTime() const {
[-] [+]	Added	mongodb-src-r2.4.12-no-werror.patch ^
@@ -0,0 +1,23 @@ +diff -Ndur mongodb-src-r2.4.12/SConstruct mongodb-src-r2.4.12-no-werror/SConstruct +--- mongodb-src-r2.4.12/SConstruct 2014-10-14 23:40:29.000000000 +0300 ++++ mongodb-src-r2.4.12-no-werror/SConstruct 2015-02-25 14:18:33.647942817 +0200 +@@ -713,8 +713,6 @@ + # env.Append( " -Wconversion" ) TODO: this doesn't really work yet + if linux: + env.Append( CCFLAGS=["-pipe"] ) +- if not has_option("disable-warnings-as-errors"): +- env.Append( CCFLAGS=["-Werror"] ) + if not has_option('clang'): + env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's + +diff -Ndur mongodb-src-r2.4.12/src/third_party/v8/SConscript mongodb-src-r2.4.12-no-werror/src/third_party/v8/SConscript +--- mongodb-src-r2.4.12/src/third_party/v8/SConscript 2014-10-14 23:40:29.000000000 +0300 ++++ mongodb-src-r2.4.12-no-werror/src/third_party/v8/SConscript 2015-02-25 14:19:07.848567918 +0200 +@@ -47,7 +47,6 @@ + 'gcc': { + 'all': { + 'CCFLAGS': ['-Wall', +- '-Werror', + '-W', + '-Wno-unused-parameter', + '-Woverloaded-virtual',
[-] [+]	Added	mongodb_2_4_10_add_js_engine_v8_3_14_option.patch ^
@@ -0,0 +1,4451 @@ +From: Michel Normand <normand@linux.vnet.ibm.com> +Subject: mongodb_2_4_10_add_js_engine_v8_3_14_option.patch +Date: Wed, 04 Feb 2015 12:58:46 +0100 + +V8 3.14 scripting engine. Disabled by default. Enable using SCons flag js-engine=v8-3.14 + + +This patch is similar to what was done in mongodb upstream: +for the commit 7e3f93197f73e5a2e0d1cff55c928dde102aa970 +by Benety Goh <benety@mongodb.com> +SERVER-13686 V8 3.25 scripting engine. Disabled by default. Enable using SCons flag js-engine=v8-3.25 + +Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com> + +--- + SConstruct \| 13 + buildscripts/utils.py \| 5 + src/mongo/SConscript \| 10 + src/mongo/scripting/engine_v8-3.14.cpp \| 1738 +++++++++++++++++++++++++++++++ + src/mongo/scripting/engine_v8-3.14.h \| 560 +++++++++ + src/mongo/scripting/v8-3.14_db.cpp \| 981 +++++++++++++++++ + src/mongo/scripting/v8-3.14_db.h \| 122 ++ + src/mongo/scripting/v8-3.14_profiler.cpp \| 65 + + src/mongo/scripting/v8-3.14_profiler.h \| 46 + src/mongo/scripting/v8-3.14_utils.cpp \| 255 ++++ + src/mongo/scripting/v8-3.14_utils.h \| 106 + + src/third_party/SConscript \| 8 + src/third_party/v8-3.14/SConscript \| 396 +++++++ + 13 files changed, 4295 insertions(+), 10 deletions(-) + +Index: mongodb-src-r2.4.10/SConstruct +=================================================================== +--- mongodb-src-r2.4.10.orig/SConstruct ++++ mongodb-src-r2.4.10/SConstruct +@@ -173,7 +173,9 @@ add_option( "ssl" , "Enable SSL" , 0 , T + + # library choices + add_option( "usesm" , "use spider monkey for javascript" , 0 , True ) +-add_option( "usev8" , "use v8 for javascript" , 0 , True ) ++js_engine_choices = ['v8-3.12', 'v8-3.14', 'none'] ++add_option( "js-engine", "JavaScript scripting engine implementation", 1, True, ++ type='choice', default=js_engine_choices[0], choices=js_engine_choices) + + # mongo feature options + add_option( "noshell", "don't build shell" , 0 , True ) +@@ -276,7 +278,13 @@ debugLogging = has_option( "debugBuildAn + noshell = has_option( "noshell" ) + + usesm = has_option( "usesm" ) +-usev8 = has_option( "usev8" ) ++jsEngine = get_option( "js-engine") ++ ++if ( not ( usesm ) ): ++ usev8 = (jsEngine != 'none') ++ ++v8version = jsEngine[3:] if jsEngine.startswith('v8-') else 'none' ++v8suffix = '' if v8version == '3.12' else '-' + v8version + + asio = has_option( "asio" ) + +@@ -1136,6 +1144,7 @@ Export("testEnv") + Export("has_option use_system_version_of_library") + Export("installSetup") + Export("usesm usev8") ++Export("v8version v8suffix") + Export("darwin windows solaris linux freebsd nix") + Export('module_sconscripts') + Export("debugBuild") +Index: mongodb-src-r2.4.10/buildscripts/utils.py +=================================================================== +--- mongodb-src-r2.4.10.orig/buildscripts/utils.py ++++ mongodb-src-r2.4.10/buildscripts/utils.py +@@ -24,6 +24,11 @@ def getAllSourceFiles( arr=None , prefix + for x in os.listdir( prefix ): + if x.startswith( "." ) or x.startswith( "pcre-" ) or x.startswith( "32bit" ) or x.startswith( "mongodb-" ) or x.startswith("debian") or x.startswith( "mongo-cxx-driver" ): + continue ++ # XXX: Avoid conflict between v8 and v8-3.14 source files in ++ # src/mongo/scripting ++ # Remove after v8-3.14 migration. ++ if x.find("v8-3.14") != -1: ++ continue + full = prefix + "/" + x + if os.path.isdir( full ) and not os.path.islink( full ): + getAllSourceFiles( arr , full ) +Index: mongodb-src-r2.4.10/src/mongo/SConscript +=================================================================== +--- mongodb-src-r2.4.10.orig/src/mongo/SConscript ++++ mongodb-src-r2.4.10/src/mongo/SConscript +@@ -11,6 +11,7 @@ Import("shellEnv") + Import("testEnv") + Import("has_option") + Import("usesm usev8") ++Import("v8suffix") + Import("installSetup") + Import("enforce_glibc") + Import("darwin windows solaris linux nix") +@@ -315,10 +316,11 @@ if usesm: + 'scripting/sm_db.cpp'], + LIBDEPS=['$BUILD_DIR/third_party/js-1.7/js', 'bson_template_evaluator']) + elif usev8: +- env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp', +- 'scripting/v8_db.cpp', +- 'scripting/v8_utils.cpp', +- 'scripting/v8_profiler.cpp'], ++ env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8' + v8suffix + '.cpp', ++ 'scripting/v8' + v8suffix + '_db.cpp', ++ 'scripting/v8' + v8suffix + '_utils.cpp', ++ 'scripting/v8' + v8suffix + ++ '_profiler.cpp'], + LIBDEPS=['bson_template_evaluator', '$BUILD_DIR/third_party/shim_v8']) + else: + env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_none.cpp'], +Index: mongodb-src-r2.4.10/src/mongo/scripting/engine_v8-3.14.cpp +=================================================================== +--- /dev/null ++++ mongodb-src-r2.4.10/src/mongo/scripting/engine_v8-3.14.cpp +@@ -0,0 +1,1738 @@ ++//engine_v8.cpp ++ ++/* Copyright 2009 10gen Inc. ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU Affero General Public License, version 3, ++ * as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU Affero General Public License for more details. ++ * ++ * You should have received a copy of the GNU Affero General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ / ++ ++#include "mongo/scripting/engine_v8-3.14.h" ++ ++#include "mongo/platform/unordered_set.h" ++#include "mongo/scripting/v8-3.14_db.h" ++#include "mongo/scripting/v8-3.14_utils.h" ++#include "mongo/util/base64.h" ++#include "mongo/util/mongoutils/str.h" ++ ++using namespace mongoutils; ++ ++namespace mongo { ++ ++ // Generated symbols for JS files ++ namespace JSFiles { ++ extern const JSFile types; ++ extern const JSFile assert; ++ } ++ ++ // The unwrapXXX functions extract internal fields from an object wrapped by wrapBSONObject. ++ // These functions are currently only used in places that should always have the correct ++ // type of object, however it may be possible for users to come up with a way to make these ++ // called with the wrong type so calling code should always check the returns. ++ static BSONHolder unwrapHolder(V8Scope* scope, const v8::Handle<v8::Object>& obj) { ++ // Warning: can't throw exceptions in this context. ++ if (!scope->LazyBsonFT()->HasInstance(obj)) ++ return NULL; ++ ++ v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(obj->GetInternalField(0)); ++ if (field.IsEmpty() \|\| !field->IsExternal()) ++ return 0; ++ void* ptr = field->Value(); ++ return (BSONHolder)ptr; ++ } ++ ++ static BSONObj unwrapBSONObj(V8Scope scope, const v8::Handle<v8::Object>& obj) { ++ // Warning: can't throw exceptions in this context. ++ BSONHolder* holder = unwrapHolder(scope, obj); ++ return holder ? holder->_obj : BSONObj(); ++ } ++ ++ static v8::Handle<v8::Object> unwrapObject(V8Scope* scope, const v8::Handle<v8::Object>& obj) { ++ // Warning: can't throw exceptions in this context. ++ if (!scope->LazyBsonFT()->HasInstance(obj)) ++ return v8::Handle<v8::Object>(); ++ ++ return obj->GetInternalField(1).As<v8::Object>(); ++ } ++ ++ void V8Scope::wrapBSONObject(v8::Handle<v8::Object> obj, BSONObj data, bool readOnly) { ++ verify(LazyBsonFT()->HasInstance(obj)); ++ ++ // Nothing below throws ++ BSONHolder* holder = new BSONHolder(data); ++ holder->_readOnly = readOnly; ++ holder->_scope = this; ++ obj->SetInternalField(0, v8::External::New(holder)); // Holder ++ obj->SetInternalField(1, v8::Object::New()); // Object ++ v8::Persistent<v8::Object> p = v8::Persistent<v8::Object>::New(obj); ++ bsonHolderTracker.track(p, holder); ++ } ++ ++ static v8::Handle<v8::Value> namedGet(v8::Local<v8::String> name, ++ const v8::AccessorInfo& info) { ++ v8::HandleScope handle_scope; ++ v8::Handle<v8::Value> val;
[-] [+]	Added	mongodb_2_4_10_add_v8_3_14.patch.bz2 ^
@@ -0,0 +1,482351 @@ +From: Michel Normand <normand@linux.vnet.ibm.com> +Subject: mongodb_2_4_10_add_v8_3_14 +Date: Wed, 04 Feb 2015 12:48:58 +0100 + +Add V8 3.14.5 (sha 8418fb6) in src/third_party/v8-3.14/ + +using the following: +Extract snapshot using git archive +Unpack 3.14.tar into /tmp/third_party/v8-3.14 +Reduce the size of /tmp/third_party/v8-3.14 +move the /tmp/third_party/v8-3.14 in new src/third_party/v8-3.14 +=== +$git clone https://github.com/v8/v8.git +$cd v8 +$gta \| grep -E 'tag.3.14.5' +\| \| \| 8418fb6 (tag: 3.14.5) Version 3.14.5 +$git archive 8418fb6 >/tmp/v8-3.14.tar +$mkdir -p /tmp/third_party/v8-3.14 +$cd /tmp/third_party/v8-3.14; tar -xf /tmp/v8-3.14.tar +$rm -rf benchmarks/ \ +> build/ \ +> codereview.settings \ +> DEPS \ +> WATCHLISTS \ +> Makefile \ +> Makefile.android \ +> Makefile.nacl \ +> samples/ \ +> test/ \ +> tools/ \ +> .gitignore +=== + +This patch is similar to what was done in mongodb upstream: +for the commit 9565dd19d144e44ee2aa993fefd23a234028f376 +by Benety Goh <benety@mongodb.com> +SERVER-13686 Add V8 3.25.28.14 (SHA1 92cf0d798d3ad54a903818815286dd83a3ea5f63) to src/third_party/v8-3.25 + + +Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com> +--- + src/third_party/v8-3.14/AUTHORS \| 58 + src/third_party/v8-3.14/ChangeLog \| 4724 +++ + src/third_party/v8-3.14/LICENSE \| 54 + src/third_party/v8-3.14/LICENSE.strongtalk \| 29 + src/third_party/v8-3.14/LICENSE.v8 \| 26 + src/third_party/v8-3.14/LICENSE.valgrind \| 45 + src/third_party/v8-3.14/OWNERS \| 11 + src/third_party/v8-3.14/PRESUBMIT.py \| 71 + src/third_party/v8-3.14/SConstruct \| 1636 + + src/third_party/v8-3.14/include/v8-debug.h \| 408 + src/third_party/v8-3.14/include/v8-preparser.h \| 118 + src/third_party/v8-3.14/include/v8-profiler.h \| 565 + src/third_party/v8-3.14/include/v8-testing.h \| 105 + src/third_party/v8-3.14/include/v8.h \| 4700 +++ + src/third_party/v8-3.14/include/v8stdint.h \| 54 + src/third_party/v8-3.14/preparser/SConscript \| 38 + src/third_party/v8-3.14/preparser/preparser-process.cc \| 370 + src/third_party/v8-3.14/preparser/preparser.gyp \| 42 + src/third_party/v8-3.14/src/SConscript \| 413 + src/third_party/v8-3.14/src/accessors.cc \| 857 + src/third_party/v8-3.14/src/accessors.h \| 128 + src/third_party/v8-3.14/src/allocation-inl.h \| 49 + src/third_party/v8-3.14/src/allocation.cc \| 123 + src/third_party/v8-3.14/src/allocation.h \| 142 + src/third_party/v8-3.14/src/api.cc \| 6645 ++++ + src/third_party/v8-3.14/src/api.h \| 594 + src/third_party/v8-3.14/src/apinatives.js \| 122 + src/third_party/v8-3.14/src/apiutils.h \| 78 + src/third_party/v8-3.14/src/arguments.h \| 130 + src/third_party/v8-3.14/src/arm/assembler-arm-inl.h \| 489 + src/third_party/v8-3.14/src/arm/assembler-arm.cc \| 2781 ++ + src/third_party/v8-3.14/src/arm/assembler-arm.h \| 1537 + + src/third_party/v8-3.14/src/arm/builtins-arm.cc \| 1808 + + src/third_party/v8-3.14/src/arm/code-stubs-arm.cc \| 7633 +++++ + src/third_party/v8-3.14/src/arm/code-stubs-arm.h \| 905 + src/third_party/v8-3.14/src/arm/codegen-arm.cc \| 457 + src/third_party/v8-3.14/src/arm/codegen-arm.h \| 93 + src/third_party/v8-3.14/src/arm/constants-arm.cc \| 152 + src/third_party/v8-3.14/src/arm/constants-arm.h \| 774 + src/third_party/v8-3.14/src/arm/cpu-arm.cc \| 120 + src/third_party/v8-3.14/src/arm/debug-arm.cc \| 345 + src/third_party/v8-3.14/src/arm/deoptimizer-arm.cc \| 1119 + src/third_party/v8-3.14/src/arm/disasm-arm.cc \| 1537 + + src/third_party/v8-3.14/src/arm/frames-arm.cc \| 45 + src/third_party/v8-3.14/src/arm/frames-arm.h \| 186 + src/third_party/v8-3.14/src/arm/full-codegen-arm.cc \| 4542 +++ + src/third_party/v8-3.14/src/arm/ic-arm.cc \| 1801 + + src/third_party/v8-3.14/src/arm/lithium-arm.cc \| 2315 + + src/third_party/v8-3.14/src/arm/lithium-arm.h \| 2615 + + src/third_party/v8-3.14/src/arm/lithium-codegen-arm.cc \| 5688 ++++ + src/third_party/v8-3.14/src/arm/lithium-codegen-arm.h \| 488 + src/third_party/v8-3.14/src/arm/lithium-gap-resolver-arm.cc \| 311 + src/third_party/v8-3.14/src/arm/lithium-gap-resolver-arm.h \| 83 + src/third_party/v8-3.14/src/arm/macro-assembler-arm.cc \| 3876 ++ + src/third_party/v8-3.14/src/arm/macro-assembler-arm.h \| 1426 + + src/third_party/v8-3.14/src/arm/regexp-macro-assembler-arm.cc \| 1420 + + src/third_party/v8-3.14/src/arm/regexp-macro-assembler-arm.h \| 259 + src/third_party/v8-3.14/src/arm/simulator-arm.cc \| 3387 ++ + src/third_party/v8-3.14/src/arm/simulator-arm.h \| 462 + src/third_party/v8-3.14/src/arm/stub-cache-arm.cc \| 4786 +++ + src/third_party/v8-3.14/src/array.js \| 1558 + + src/third_party/v8-3.14/src/assembler.cc \| 1375 + + src/third_party/v8-3.14/src/assembler.h \| 896 + src/third_party/v8-3.14/src/ast.cc \| 1139 + src/third_party/v8-3.14/src/ast.h \| 2912 ++ + src/third_party/v8-3.14/src/atomicops.h \| 171 + src/third_party/v8-3.14/src/atomicops_internals_arm_gcc.h \| 145 + src/third_party/v8-3.14/src/atomicops_internals_mips_gcc.h \| 181 + src/third_party/v8-3.14/src/atomicops_internals_x86_gcc.cc \| 133 + src/third_party/v8-3.14/src/atomicops_internals_x86_gcc.h \| 287 + src/third_party/v8-3.14/src/atomicops_internals_x86_macosx.h \| 301 + src/third_party/v8-3.14/src/atomicops_internals_x86_msvc.h \| 203 + src/third_party/v8-3.14/src/bignum-dtoa.cc \| 658 + src/third_party/v8-3.14/src/bignum-dtoa.h \| 81 + src/third_party/v8-3.14/src/bignum.cc \| 767 + src/third_party/v8-3.14/src/bignum.h \| 141 + src/third_party/v8-3.14/src/bootstrapper.cc \| 2408 + + src/third_party/v8-3.14/src/bootstrapper.h \| 189 + src/third_party/v8-3.14/src/builtins.cc \| 1725 + + src/third_party/v8-3.14/src/builtins.h \| 394 + src/third_party/v8-3.14/src/bytecodes-irregexp.h \| 104 + src/third_party/v8-3.14/src/cached-powers.cc \| 179 + src/third_party/v8-3.14/src/cached-powers.h \| 64 + src/third_party/v8-3.14/src/char-predicates-inl.h \| 94 + src/third_party/v8-3.14/src/char-predicates.h \| 69 + src/third_party/v8-3.14/src/checks.cc \| 110 + src/third_party/v8-3.14/src/checks.h \| 295 + src/third_party/v8-3.14/src/circular-queue-inl.h \| 53 + src/third_party/v8-3.14/src/circular-queue.cc \| 122 + src/third_party/v8-3.14/src/circular-queue.h \| 103 + src/third_party/v8-3.14/src/code-stubs.cc \| 505 + src/third_party/v8-3.14/src/code-stubs.h \| 1191 + src/third_party/v8-3.14/src/code.h \| 70 + src/third_party/v8-3.14/src/codegen.cc \| 211 + src/third_party/v8-3.14/src/codegen.h \| 108 + src/third_party/v8-3.14/src/collection.js \| 245 + src/third_party/v8-3.14/src/compilation-cache.cc \| 516 + src/third_party/v8-3.14/src/compilation-cache.h \| 303 + src/third_party/v8-3.14/src/compiler-intrinsics.h \| 94 + src/third_party/v8-3.14/src/compiler.cc \| 1056 + src/third_party/v8-3.14/src/compiler.h \| 477 + src/third_party/v8-3.14/src/contexts.cc \| 343 + src/third_party/v8-3.14/src/contexts.h \| 453 + src/third_party/v8-3.14/src/conversions-inl.h \| 678 + src/third_party/v8-3.14/src/conversions.cc \| 432 + src/third_party/v8-3.14/src/conversions.h \| 151 + src/third_party/v8-3.14/src/counters.cc \| 97 + src/third_party/v8-3.14/src/counters.h \| 282 + src/third_party/v8-3.14/src/cpu-profiler-inl.h \| 79 + src/third_party/v8-3.14/src/cpu-profiler.cc \| 582 + src/third_party/v8-3.14/src/cpu-profiler.h \| 283 + src/third_party/v8-3.14/src/cpu.h \| 69 + src/third_party/v8-3.14/src/d8-debug.cc \| 370 + src/third_party/v8-3.14/src/d8-debug.h \| 157 + src/third_party/v8-3.14/src/d8-posix.cc \| 688 + src/third_party/v8-3.14/src/d8-readline.cc \| 160 + src/third_party/v8-3.14/src/d8-windows.cc \| 42 + src/third_party/v8-3.14/src/d8.cc \| 1914 + + src/third_party/v8-3.14/src/d8.gyp \| 113 + src/third_party/v8-3.14/src/d8.h \| 412 + src/third_party/v8-3.14/src/d8.js \| 2813 ++ + src/third_party/v8-3.14/src/data-flow.cc \| 66 + src/third_party/v8-3.14/src/data-flow.h \| 205 + src/third_party/v8-3.14/src/date.cc \| 384 + src/third_party/v8-3.14/src/date.h \| 260 + src/third_party/v8-3.14/src/date.js \| 832 + src/third_party/v8-3.14/src/dateparser-inl.h \| 334 + src/third_party/v8-3.14/src/dateparser.cc \| 212 + src/third_party/v8-3.14/src/dateparser.h \| 409 + src/third_party/v8-3.14/src/debug-agent.cc \| 469 + src/third_party/v8-3.14/src/debug-agent.h \| 132 + src/third_party/v8-3.14/src/debug-debugger.js \| 2665 + + src/third_party/v8-3.14/src/debug.cc \| 3776 ++ + src/third_party/v8-3.14/src/debug.h \| 1050 + src/third_party/v8-3.14/src/deoptimizer.cc \| 1998 + + src/third_party/v8-3.14/src/deoptimizer.h \| 842 + src/third_party/v8-3.14/src/disasm.h \| 80 + src/third_party/v8-3.14/src/disassembler.cc \| 348 + src/third_party/v8-3.14/src/disassembler.h \| 58 + src/third_party/v8-3.14/src/diy-fp.cc \| 59 + src/third_party/v8-3.14/src/diy-fp.h \| 117 + src/third_party/v8-3.14/src/double.h \| 232 + src/third_party/v8-3.14/src/dtoa.cc \| 106 + src/third_party/v8-3.14/src/dtoa.h \| 85 + src/third_party/v8-3.14/src/elements-kind.cc \| 134 + src/third_party/v8-3.14/src/elements-kind.h \| 221 + src/third_party/v8-3.14/src/elements.cc \| 1689 + + src/third_party/v8-3.14/src/elements.h \| 179 + src/third_party/v8-3.14/src/execution.cc \| 970 + src/third_party/v8-3.14/src/execution.h \| 313 + src/third_party/v8-3.14/src/extensions/externalize-string-extension.cc \| 140 + src/third_party/v8-3.14/src/extensions/externalize-string-extension.h \| 50 + src/third_party/v8-3.14/src/extensions/gc-extension.cc \| 53 + src/third_party/v8-3.14/src/extensions/gc-extension.h \| 49 + src/third_party/v8-3.14/src/extensions/statistics-extension.cc \| 153 + src/third_party/v8-3.14/src/extensions/statistics-extension.h \| 49 + src/third_party/v8-3.14/src/factory.cc \| 1435 + + src/third_party/v8-3.14/src/factory.h \| 516
[-] [+]	Added	mongodb_2_4_10_import_v8_3_14_5_JS2C_Python_scripts.patch ^
@@ -0,0 +1,706 @@ +From: Michel Normand <normand@linux.vnet.ibm.com> +Subject: mongodb_2_4_10_import_v8_3_14_5_JS2C_Python_scripts.patch +Date: Wed, 04 Feb 2015 12:58:46 +0100 + +import third_party/v8-3.14.5.10 JS2C Python scripts +(the .../tools dir is empty as per previous mongodb_2_4_10_add_v8_3_14.patch) + +This patch is similar to what was done in mongodb upstream: +for the commit b7e3345e989b819b9b82707c49bcfa7188aae767 +by Benety Goh <benety@mongodb.com> +SERVER-13686 import third_party/v8-3.25.28.14 JS2C Python scripts + +Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com> +--- + src/third_party/v8-3.14/tools/js2c.py \| 396 +++++++++++++++++++++++++++++++++ + src/third_party/v8-3.14/tools/jsmin.py \| 282 +++++++++++++++++++++++ + 2 files changed, 678 insertions(+) + +Index: mongodb-src-r2.4.10/src/third_party/v8-3.14/tools/js2c.py +=================================================================== +--- /dev/null ++++ mongodb-src-r2.4.10/src/third_party/v8-3.14/tools/js2c.py +@@ -0,0 +1,396 @@ ++#!/usr/bin/env python ++# ++# Copyright 2012 the V8 project authors. All rights reserved. ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions are ++# met: ++# ++# * Redistributions of source code must retain the above copyright ++# notice, this list of conditions and the following disclaimer. ++# * Redistributions in binary form must reproduce the above ++# copyright notice, this list of conditions and the following ++# disclaimer in the documentation and/or other materials provided ++# with the distribution. ++# * Neither the name of Google Inc. nor the names of its ++# contributors may be used to endorse or promote products derived ++# from this software without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++# This is a utility for converting JavaScript source code into C-style ++# char arrays. It is used for embedded JavaScript code in the V8 ++# library. ++ ++import os, re, sys, string ++import jsmin ++import bz2 ++ ++ ++def ToCAsciiArray(lines): ++ result = [] ++ for chr in lines: ++ value = ord(chr) ++ assert value < 128 ++ result.append(str(value)) ++ return ", ".join(result) ++ ++ ++def ToCArray(lines): ++ result = [] ++ for chr in lines: ++ result.append(str(ord(chr))) ++ return ", ".join(result) ++ ++ ++def RemoveCommentsAndTrailingWhitespace(lines): ++ lines = re.sub(r'//.\n', '\n', lines) # end-of-line comments ++ lines = re.sub(re.compile(r'/\.?\/', re.DOTALL), '', lines) # comments. ++ lines = re.sub(r'\s+\n+', '\n', lines) # trailing whitespace ++ return lines ++ ++ ++def ReadFile(filename): ++ file = open(filename, "rt") ++ try: ++ lines = file.read() ++ finally: ++ file.close() ++ return lines ++ ++ ++def ReadLines(filename): ++ result = [] ++ for line in open(filename, "rt"): ++ if '#' in line: ++ line = line[:line.index('#')] ++ line = line.strip() ++ if len(line) > 0: ++ result.append(line) ++ return result ++ ++ ++def LoadConfigFrom(name): ++ import ConfigParser ++ config = ConfigParser.ConfigParser() ++ config.read(name) ++ return config ++ ++ ++def ParseValue(string): ++ string = string.strip() ++ if string.startswith('[') and string.endswith(']'): ++ return string.lstrip('[').rstrip(']').split() ++ else: ++ return string ++ ++ ++EVAL_PATTERN = re.compile(r'\beval\s\(') ++WITH_PATTERN = re.compile(r'\bwith\s\(') ++ ++ ++def Validate(lines, file): ++ lines = RemoveCommentsAndTrailingWhitespace(lines) ++ # Because of simplified context setup, eval and with is not ++ # allowed in the natives files. ++ eval_match = EVAL_PATTERN.search(lines) ++ if eval_match: ++ raise ("Eval disallowed in natives: %s" % file) ++ with_match = WITH_PATTERN.search(lines) ++ if with_match: ++ raise ("With statements disallowed in natives: %s" % file) ++ ++ ++def ExpandConstants(lines, constants): ++ for key, value in constants: ++ lines = key.sub(str(value), lines) ++ return lines ++ ++ ++def ExpandMacros(lines, macros): ++ # We allow macros to depend on the previously declared macros, but ++ # we don't allow self-dependecies or recursion. ++ for name_pattern, macro in reversed(macros): ++ pattern_match = name_pattern.search(lines, 0) ++ while pattern_match is not None: ++ # Scan over the arguments ++ height = 1 ++ start = pattern_match.start() ++ end = pattern_match.end() ++ assert lines[end - 1] == '(' ++ last_match = end ++ arg_index = [0] # Wrap state into array, to work around Python "scoping" ++ mapping = { } ++ def add_arg(str): ++ # Remember to expand recursively in the arguments ++ replacement = ExpandMacros(str.strip(), macros) ++ mapping[macro.args[arg_index[0]]] = replacement ++ arg_index[0] += 1 ++ while end < len(lines) and height > 0: ++ # We don't count commas at higher nesting levels. ++ if lines[end] == ',' and height == 1: ++ add_arg(lines[last_match:end]) ++ last_match = end + 1 ++ elif lines[end] in ['(', '{', '[']: ++ height = height + 1 ++ elif lines[end] in [')', '}', ']']: ++ height = height - 1 ++ end = end + 1 ++ # Remember to add the last match. ++ add_arg(lines[last_match:end-1]) ++ result = macro.expand(mapping) ++ # Replace the occurrence of the macro with the expansion ++ lines = lines[:start] + result + lines[end:] ++ pattern_match = name_pattern.search(lines, start + len(result)) ++ return lines ++ ++class TextMacro: ++ def __init__(self, args, body): ++ self.args = args ++ self.body = body ++ def expand(self, mapping): ++ result = self.body ++ for key, value in mapping.items(): ++ result = result.replace(key, value) ++ return result ++ ++class PythonMacro: ++ def __init__(self, args, fun): ++ self.args = args ++ self.fun = fun ++ def expand(self, mapping): ++ args = [] ++ for arg in self.args: ++ args.append(mapping[arg]) ++ return str(self.fun(args)) ++ ++CONST_PATTERN = re.compile(r'^const\s+([a-zA-Z0-9_]+)\s=\s([^;]);$')
[-] [+]	Added	mongodb_2_4_10_update_v8_3_14_SConscript_for_ppc.patch ^
@@ -0,0 +1,90 @@ +From: Michel Normand <normand@linux.vnet.ibm.com> +Subject: ppc debug +Date: Tue, 10 Feb 2015 08:36:37 +0100 + +add PowerPC related line in src/third_party/v8-3.14/SConscript + +Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com> +--- + src/third_party/v8-3.14/SConscript \| 54 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 54 insertions(+) + +Index: mongodb-src-r2.4.10/src/third_party/v8-3.14/SConscript +=================================================================== +--- mongodb-src-r2.4.10.orig/src/third_party/v8-3.14/SConscript ++++ mongodb-src-r2.4.10/src/third_party/v8-3.14/SConscript +@@ -74,6 +74,12 @@ LIBRARY_FLAGS = { + 'arch:x64': { + 'CPPDEFINES': ['V8_TARGET_ARCH_X64'], + }, ++ 'arch:ppc': { ++ 'CPPDEFINES': ['V8_TARGET_ARCH_PPC'], ++ }, ++ 'arch:ppc64': { ++ 'CPPDEFINES': ['V8_TARGET_ARCH_PPC', 'V8_TARGET_ARCH_PPC64'], ++ }, + }, + 'msvc': { + 'all': { +@@ -241,6 +247,48 @@ SOURCES = { + x64/regexp-macro-assembler-x64.cc + x64/stub-cache-x64.cc + """), ++ 'arch:ppc': Split(""" ++ ppc/assembler-ppc.cc ++ ppc/builtins-ppc.cc ++ ppc/code-stubs-ppc.cc ++ ppc/codegen-ppc.cc ++ ppc/constants-ppc.cc ++ ppc/cpu-ppc.cc ++ ppc/debug-ppc.cc ++ ppc/deoptimizer-ppc.cc ++ ppc/disasm-ppc.cc ++ ppc/frames-ppc.cc ++ ppc/full-codegen-ppc.cc ++ ppc/ic-ppc.cc ++ ppc/lithium-codegen-ppc.cc ++ ppc/lithium-gap-resolver-ppc.cc ++ ppc/lithium-ppc.cc ++ ppc/macro-assembler-ppc.cc ++ ppc/regexp-macro-assembler-ppc.cc ++ ppc/simulator-ppc.cc ++ ppc/stub-cache-ppc.cc ++ """), ++ 'arch:ppc64': Split(""" ++ ppc/assembler-ppc.cc ++ ppc/builtins-ppc.cc ++ ppc/code-stubs-ppc.cc ++ ppc/codegen-ppc.cc ++ ppc/constants-ppc.cc ++ ppc/cpu-ppc.cc ++ ppc/debug-ppc.cc ++ ppc/deoptimizer-ppc.cc ++ ppc/disasm-ppc.cc ++ ppc/frames-ppc.cc ++ ppc/full-codegen-ppc.cc ++ ppc/ic-ppc.cc ++ ppc/lithium-codegen-ppc.cc ++ ppc/lithium-gap-resolver-ppc.cc ++ ppc/lithium-ppc.cc ++ ppc/macro-assembler-ppc.cc ++ ppc/regexp-macro-assembler-ppc.cc ++ ppc/simulator-ppc.cc ++ ppc/stub-cache-ppc.cc ++ """), + 'os:freebsd': ['platform-freebsd.cc', 'platform-posix.cc'], + 'os:openbsd': ['platform-openbsd.cc', 'platform-posix.cc'], + 'os:linux': ['platform-linux.cc', 'platform-posix.cc'], +@@ -293,6 +341,12 @@ def get_options(): + arch_string = 'arch:x64' + elif processor == 'amd64': + arch_string = 'arch:x64' ++ elif processor == 'ppc': ++ arch_string = 'arch:ppc' ++ elif processor == 'ppc64': ++ arch_string = 'arch:ppc64' ++ elif processor == 'ppc64le': ++ arch_string = 'arch:ppc64' + else: + assert False, "Unsupported architecture: " + processor +
[-] [+]	Added	mongodb_2_4_10_update_v8_3_14_to_cid_7d1b8b5.patch.bz2 ^
@@ -0,0 +1,56567 @@ +From: Michel Normand <normand@linux.vnet.ibm.com> +Subject: mongodb 2 4 10 update v8 3 14 to cid 7d1b8b5 +Date: Mon, 09 Feb 2015 12:27:32 +0100 + +mongodb_2_4_10 update src/third_party/v8-3.14/ + +from github.com/andrewlow/v8ppc.git +cid 7d1b8b5 git head of libv8-3.14 branch +cid 8418fb6 associated to previous patch mongodb_2_4_10_add_v8_3_14.patch + +as detailed below: +=== +$git clone https://github.com/andrewlow/v8ppc.git +$cd v8ppc +$gbr \|grep \* +* libv8-3.14 +$gta \| grep -E '7d1b8b5\|8418fb6' +\| \| \| \| * 7d1b8b5 (HEAD, origin/libv8-3.14, libv8-3.14) Missing change from objects-inl.h and whitespace change +\| \| \| \| * 8418fb6 Version 3.14.5 +=== +tarfile=/tmp/v8-3.14_cid_7d1b8b5.tar +tmpdir=/tmp/third_party/v8-3.14_cid_7d1b8b5 +$git archive 7d1b8b5 >$tarfile +=== +$mkdir $tmpdir && cd $tmpdir && tar -xf $tarfile +$rm -rf benchmarks/ build/ codereview.settings DEPS WATCHLISTS Makefile Makefile.android Makefile.nacl samples/ test/ tools/ .gitignore +=== +... +$cd mongodb.tmp/mongodb-src-r2.4.10 +[normand@mnoW520:~/work/mongodb.tmp/mongodb-src-r2.4.10] +$quilt applied +mongodb_2_4_10_add_v8_3_14.patch +$quilt new mongodb_2_4_10_update_v8_3_14_to_cid_7d1b8b5.patch +$for xx in $(cd $tmpdir; find ./ -type d); do mkdir src/third_party/v8-3.14/$xx ;done +$for xx in $(cd $tmpdir; find ./ ! -type d); do quilt add src/third_party/v8-3.14/$xx ;done +$cp -rp $tmpdir/* src/third_party/v8-3.14/ +$quilt refresh +=== + +Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com> +--- + src/third_party/v8-3.14/AUTHORS \| 5 + src/third_party/v8-3.14/ChangeLog \| 4 + src/third_party/v8-3.14/LICENSE.valgrind \| 10 + src/third_party/v8-3.14/README.md \| 10 + src/third_party/v8-3.14/aix_gyp.patch \| 62 + src/third_party/v8-3.14/include/v8.h \| 6 + src/third_party/v8-3.14/src/api.cc \| 11 + src/third_party/v8-3.14/src/arm/stub-cache-arm.cc \| 7 + src/third_party/v8-3.14/src/assembler.cc \| 21 + src/third_party/v8-3.14/src/assembler.h \| 42 + src/third_party/v8-3.14/src/atomicops.h \| 5 + src/third_party/v8-3.14/src/atomicops_internals_ppc_gcc.h \| 167 + src/third_party/v8-3.14/src/builtins.cc \| 7 + src/third_party/v8-3.14/src/checks.h \| 16 + src/third_party/v8-3.14/src/code-stubs.h \| 15 + src/third_party/v8-3.14/src/codegen.cc \| 2 + src/third_party/v8-3.14/src/codegen.h \| 2 + src/third_party/v8-3.14/src/contexts.h \| 6 + src/third_party/v8-3.14/src/conversions-inl.h \| 4 + src/third_party/v8-3.14/src/d8.gyp \| 3 + src/third_party/v8-3.14/src/deoptimizer.h \| 8 + src/third_party/v8-3.14/src/disassembler.cc \| 4 + src/third_party/v8-3.14/src/execution.h \| 2 + src/third_party/v8-3.14/src/flag-definitions.h \| 3 + src/third_party/v8-3.14/src/frames-inl.h \| 2 + src/third_party/v8-3.14/src/full-codegen.h \| 12 + src/third_party/v8-3.14/src/globals.h \| 33 + src/third_party/v8-3.14/src/heap.cc \| 4 + src/third_party/v8-3.14/src/hydrogen-instructions.cc \| 13 + src/third_party/v8-3.14/src/hydrogen-instructions.h \| 3 + src/third_party/v8-3.14/src/hydrogen.cc \| 7 + src/third_party/v8-3.14/src/ia32/code-stubs-ia32.cc \| 2 + src/third_party/v8-3.14/src/ia32/stub-cache-ia32.cc \| 14 + src/third_party/v8-3.14/src/isolate.cc \| 23 + src/third_party/v8-3.14/src/isolate.h \| 27 + src/third_party/v8-3.14/src/json-parser.h \| 81 + src/third_party/v8-3.14/src/jsregexp.cc \| 5 + src/third_party/v8-3.14/src/jsregexp.h \| 7 + src/third_party/v8-3.14/src/lithium-allocator-inl.h \| 2 + src/third_party/v8-3.14/src/lithium-allocator.cc \| 2 + src/third_party/v8-3.14/src/lithium.cc \| 3 + src/third_party/v8-3.14/src/lithium.h \| 4 + src/third_party/v8-3.14/src/log.cc \| 2 + src/third_party/v8-3.14/src/macro-assembler.h \| 7 + src/third_party/v8-3.14/src/messages.cc \| 10 + src/third_party/v8-3.14/src/mips/lithium-codegen-mips.cc \| 2 + src/third_party/v8-3.14/src/mips/stub-cache-mips.cc \| 9 + src/third_party/v8-3.14/src/objects-inl.h \| 85 + src/third_party/v8-3.14/src/objects.cc \| 60 + src/third_party/v8-3.14/src/objects.h \| 53 + src/third_party/v8-3.14/src/parser.cc \| 14 + src/third_party/v8-3.14/src/platform-aix.cc \| 894 + + src/third_party/v8-3.14/src/platform-freebsd.cc \| 4 + src/third_party/v8-3.14/src/platform-linux.cc \| 18 + src/third_party/v8-3.14/src/platform-posix.cc \| 25 + src/third_party/v8-3.14/src/platform.h \| 3 + src/third_party/v8-3.14/src/ppc/assembler-ppc-inl.h \| 457 + src/third_party/v8-3.14/src/ppc/assembler-ppc.cc \| 1881 ++ + src/third_party/v8-3.14/src/ppc/assembler-ppc.h \| 1382 + + src/third_party/v8-3.14/src/ppc/builtins-ppc.cc \| 1910 ++ + src/third_party/v8-3.14/src/ppc/code-stubs-ppc.cc \| 7530 ++++++++++ + src/third_party/v8-3.14/src/ppc/code-stubs-ppc.h \| 884 + + src/third_party/v8-3.14/src/ppc/codegen-ppc.cc \| 492 + src/third_party/v8-3.14/src/ppc/codegen-ppc.h \| 96 + src/third_party/v8-3.14/src/ppc/constants-ppc.cc \| 122 + src/third_party/v8-3.14/src/ppc/constants-ppc.h \| 637 + src/third_party/v8-3.14/src/ppc/cpu-ppc.cc \| 90 + src/third_party/v8-3.14/src/ppc/debug-ppc.cc \| 362 + src/third_party/v8-3.14/src/ppc/deoptimizer-ppc.cc \| 1259 + + src/third_party/v8-3.14/src/ppc/disasm-ppc.cc \| 1339 + + src/third_party/v8-3.14/src/ppc/frames-ppc.cc \| 48 + src/third_party/v8-3.14/src/ppc/frames-ppc.h \| 228 + src/third_party/v8-3.14/src/ppc/full-codegen-ppc.cc \| 4609 ++++++ + src/third_party/v8-3.14/src/ppc/ic-ppc.cc \| 1832 ++ + src/third_party/v8-3.14/src/ppc/lithium-codegen-ppc.cc \| 5715 +++++++ + src/third_party/v8-3.14/src/ppc/lithium-codegen-ppc.h \| 479 + src/third_party/v8-3.14/src/ppc/lithium-gap-resolver-ppc.cc \| 311 + src/third_party/v8-3.14/src/ppc/lithium-gap-resolver-ppc.h \| 86 + src/third_party/v8-3.14/src/ppc/lithium-ppc.cc \| 2323 +++ + src/third_party/v8-3.14/src/ppc/lithium-ppc.h \| 2620 +++ + src/third_party/v8-3.14/src/ppc/macro-assembler-ppc.cc \| 4460 +++++ + src/third_party/v8-3.14/src/ppc/macro-assembler-ppc.h \| 1657 ++ + src/third_party/v8-3.14/src/ppc/regexp-macro-assembler-ppc.cc \| 1464 + + src/third_party/v8-3.14/src/ppc/regexp-macro-assembler-ppc.h \| 270 + src/third_party/v8-3.14/src/ppc/simulator-ppc.cc \| 3479 ++++ + src/third_party/v8-3.14/src/ppc/simulator-ppc.h \| 410 + src/third_party/v8-3.14/src/ppc/stub-cache-ppc.cc \| 4466 +++++ + src/third_party/v8-3.14/src/preparser.h \| 4 + src/third_party/v8-3.14/src/profile-generator.cc \| 5 + src/third_party/v8-3.14/src/regexp-macro-assembler.h \| 1 + src/third_party/v8-3.14/src/runtime.cc \| 7 + src/third_party/v8-3.14/src/scopes.cc \| 11 + src/third_party/v8-3.14/src/serialize.cc \| 35 + src/third_party/v8-3.14/src/simulator.h \| 2 + src/third_party/v8-3.14/src/third_party/valgrind/valgrind.h \| 44 + src/third_party/v8-3.14/src/version.cc \| 2 + src/third_party/v8-3.14/src/x64/code-stubs-x64.cc \| 2 + src/third_party/v8-3.14/src/x64/stub-cache-x64.cc \| 14 + 98 files changed, 54652 insertions(+), 225 deletions(-) + +Index: mongodb-src-r2.4.10/src/third_party/v8-3.14/AUTHORS +=================================================================== +--- mongodb-src-r2.4.10.orig/src/third_party/v8-3.14/AUTHORS ++++ mongodb-src-r2.4.10/src/third_party/v8-3.14/AUTHORS +@@ -7,6 +7,7 @@ Google Inc. + Sigma Designs Inc. + ARM Ltd. + Hewlett-Packard Development Company, LP ++IBM Corporation + Igalia, S.L. + Joyent, Inc. + +@@ -15,11 +16,14 @@ Alexander Botero-Lowry <alexbl@FreeBSD.o + Alexander Karpinsky <homm86@gmail.com> + Alexandre Vassalotti <avassalotti@gmail.com> + Andreas Anyuru <andreas.anyuru@gmail.com> ++Andrew Low <andrew_low@ca.ibm.com> + Bert Belder <bertbelder@gmail.com> + Burcu Dogan <burcujdogan@gmail.com> + Craig Schlenter <craig.schlenter@gmail.com> + Daniel Andersson <kodandersson@gmail.com> + Daniel James <dnljms@gmail.com> ++David Eelsohn <dje.gcc@gmail.com> ++Derek J Conrod <dconrod@codeaurora.org> + Dineel D Sule <dsule@codeaurora.org> + Erich Ocean <erich.ocean@me.com> + Fedor Indutny <fedor@indutny.com> +@@ -36,6 +40,7 @@ Kun Zhang <zhangk@codeaurora.org> + Martyn Capewell <martyn.capewell@arm.com> + Mathias Bynens <mathias@qiwi.be> + Matt Hanselman <mjhanselman@gmail.com> ++Matthew Brandyberry <mbrandy@us.ibm.com> + Maxim Mossienko <maxim.mossienko@gmail.com> + Michael Lutz <michi@icosahedron.de> + Michael Smith <mike@w3.org> +Index: mongodb-src-r2.4.10/src/third_party/v8-3.14/ChangeLog +=================================================================== +--- mongodb-src-r2.4.10.orig/src/third_party/v8-3.14/ChangeLog ++++ mongodb-src-r2.4.10/src/third_party/v8-3.14/ChangeLog +@@ -1174,7 +1174,7 @@ + + 2011-12-21: Version 3.8.2 + +- Add max optimization flag to v8 gyp build to ensure V8 is always built ++ Add max optimization flag to v8 gyp build to ensure V8 is always built + fully optimized in Chrome. + + MIPS: Bring MIPS to parity with other platforms. +@@ -1193,7 +1193,7 @@ + + Fixed handling of arrays in DefineOwnProperty. (issue 1756) + +- Sync parser and preparser on do-while and return statements. ++ Sync parser and preparser on do-while and return statements. + (issue 1856) + + Fixed another corner case for DefineOwnProperty on arrays (issue 1756). +Index: mongodb-src-r2.4.10/src/third_party/v8-3.14/LICENSE.valgrind
[-] [+]	Added	mongodb_2_4_10_update_v8_3_14_to_ppc_branch_cid_dea1f48.patch ^
@@ -0,0 +1,1704 @@ +From: Michel Normand <normand@linux.vnet.ibm.com> +Subject: mongodb 2 4 10 update v8 3 14 to ppc branch cid dea1f48 +Date: Mon, 09 Feb 2015 14:28:15 +0100 + +mongodb_2_4_10 update src/third_party/v8-3.14/ to ppc branch cid dea1f48 + +from github.com/andrewlow/v8ppc.git +cid dea1f48 git head of 3.14-ppc branch +cid 7d1b8b5 git head of libv8-3.14 branch +cid 8418fb6 associated to previous patch mongodb_2_4_10_add_v8_3_14.patch to + +as detailed below: +=== +$git clone https://github.com/andrewlow/v8ppc.git +$cd v8ppc +$gco 3.14-ppc +$gbr \|grep \* +* 3.14-ppc +$gta \| grep 3.14-ppc +\| \| \| \| * dea1f48 (HEAD, tag: export-3.14-to-node-2014-12-22, origin/3.14-ppc, 3.14-ppc) PPC: perf enhancement: use bctrl for calls (vs blrl). +... +=== +export cid=dea1f48 +export tmpdir=/tmp/third_party/v8-3.14_cid_$cid +export tarfile=/tmp/v8-3.14_cid_$cid.tar +$git archive $cid >$tarfile +=== +$mkdir $tmpdir && cd $tmpdir && tar -xf $tarfile +$rm -rf benchmarks/ build/ codereview.settings DEPS WATCHLISTS Makefile Makefile.android Makefile.nacl samples/ test/ tools/ .gitignore +=== +... +$cd mongodb.tmp/mongodb-src-r2.4.10 +[normand@mnoW520:~/work/mongodb.tmp/mongodb-src-r2.4.10] +$quilt applied +mongodb_2_4_10_add_v8_3_14.patch.bz2 +mongodb_2_4_10_update_v8_3_14_to_cid_7d1b8b5.patch.bz2 +$quilt new mongodb_2_4_10_update_v8_3_14_to_ppc_branch_cid_dea1f48.patch +$for xx in $(cd $tmpdir; find ./ ! -type d); do quilt add src/third_party/v8-3.14/$xx ;done +$cp -rp $tmpdir/* src/third_party/v8-3.14/ +$quilt refresh +=== +Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com> +--- + src/third_party/v8-3.14/ChangeLog \| 4 + src/third_party/v8-3.14/LICENSE.valgrind \| 10 + src/third_party/v8-3.14/README.md \| 10 + src/third_party/v8-3.14/aix_gyp.patch \| 26 - + src/third_party/v8-3.14/src/assembler.h \| 4 + src/third_party/v8-3.14/src/debug.cc \| 2 + src/third_party/v8-3.14/src/heap.h \| 2 + src/third_party/v8-3.14/src/hydrogen.cc \| 4 + src/third_party/v8-3.14/src/platform-aix.cc \| 53 ++-- + src/third_party/v8-3.14/src/platform-posix.cc \| 19 + + src/third_party/v8-3.14/src/ppc/assembler-ppc.cc \| 132 +++++++--- + src/third_party/v8-3.14/src/ppc/assembler-ppc.h \| 7 + src/third_party/v8-3.14/src/ppc/builtins-ppc.cc \| 2 + src/third_party/v8-3.14/src/ppc/code-stubs-ppc.cc \| 9 + src/third_party/v8-3.14/src/ppc/debug-ppc.cc \| 10 + src/third_party/v8-3.14/src/ppc/deoptimizer-ppc.cc \| 4 + src/third_party/v8-3.14/src/ppc/disasm-ppc.cc \| 40 ++- + src/third_party/v8-3.14/src/ppc/full-codegen-ppc.cc \| 6 + src/third_party/v8-3.14/src/ppc/ic-ppc.cc \| 30 +- + src/third_party/v8-3.14/src/ppc/lithium-codegen-ppc.cc \| 58 ++-- + src/third_party/v8-3.14/src/ppc/macro-assembler-ppc.cc \| 45 ++- + src/third_party/v8-3.14/src/ppc/macro-assembler-ppc.h \| 4 + src/third_party/v8-3.14/src/ppc/regexp-macro-assembler-ppc.cc \| 6 + src/third_party/v8-3.14/src/ppc/simulator-ppc.cc \| 116 +++++++- + src/third_party/v8-3.14/src/ppc/simulator-ppc.h \| 3 + src/third_party/v8-3.14/src/ppc/stub-cache-ppc.cc \| 2 + src/third_party/v8-3.14/src/third_party/valgrind/valgrind.h \| 44 +-- + 27 files changed, 470 insertions(+), 182 deletions(-) + +Index: mongodb-src-r2.4.10/src/third_party/v8-3.14/ChangeLog +=================================================================== +--- mongodb-src-r2.4.10.orig/src/third_party/v8-3.14/ChangeLog ++++ mongodb-src-r2.4.10/src/third_party/v8-3.14/ChangeLog +@@ -1174,7 +1174,7 @@ + + 2011-12-21: Version 3.8.2 + +- Add max optimization flag to v8 gyp build to ensure V8 is always built ++ Add max optimization flag to v8 gyp build to ensure V8 is always built + fully optimized in Chrome. + + MIPS: Bring MIPS to parity with other platforms. +@@ -1193,7 +1193,7 @@ + + Fixed handling of arrays in DefineOwnProperty. (issue 1756) + +- Sync parser and preparser on do-while and return statements. ++ Sync parser and preparser on do-while and return statements. + (issue 1856) + + Fixed another corner case for DefineOwnProperty on arrays (issue 1756). +Index: mongodb-src-r2.4.10/src/third_party/v8-3.14/LICENSE.valgrind +=================================================================== +--- mongodb-src-r2.4.10.orig/src/third_party/v8-3.14/LICENSE.valgrind ++++ mongodb-src-r2.4.10/src/third_party/v8-3.14/LICENSE.valgrind +@@ -20,16 +20,16 @@ are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +-2. The origin of this software must not be misrepresented; you must +- not claim that you wrote the original software. If you use this +- software in a product, an acknowledgment in the product ++2. The origin of this software must not be misrepresented; you must ++ not claim that you wrote the original software. If you use this ++ software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + +-4. The name of the author may not be used to endorse or promote +- products derived from this software without specific prior written ++4. The name of the author may not be used to endorse or promote ++ products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS +Index: mongodb-src-r2.4.10/src/third_party/v8-3.14/README.md +=================================================================== +--- mongodb-src-r2.4.10.orig/src/third_party/v8-3.14/README.md ++++ mongodb-src-r2.4.10/src/third_party/v8-3.14/README.md +@@ -3,8 +3,12 @@ v8ppc + + Port of Google V8 javascript engine to PowerPC - PowerLinux and AIX. + +-This branch of the code (libv8-3.14) is intended to match the 3.14.5.8 +-level of V8 that is used by the libv8 library built as part of Ubuntu ++August 9th 98% of the tests were passing. (with crankshaft!) + +-http://packages.ubuntu.com/source/trusty/libv8-3.14 ++Compile code:<br><code> ++make dependencies; make -j8 ppc ++</code> + ++Test code:<br><code> ++tools/run-tests.py -j 12 --progress=dots --no-presubmit --arch-and-mode=ppc.debug --junitout v8tests-junit.xml ++</code> +Index: mongodb-src-r2.4.10/src/third_party/v8-3.14/aix_gyp.patch +=================================================================== +--- mongodb-src-r2.4.10.orig/src/third_party/v8-3.14/aix_gyp.patch ++++ mongodb-src-r2.4.10/src/third_party/v8-3.14/aix_gyp.patch +@@ -6,30 +6,30 @@ + return 'freebsd' + + if sys.platform.startswith('aix'): + + return 'aix' +- ++ + return 'linux' +- ++ + --- build/gyp/pylib/gyp/generator/make.py + +++ build/gyp/pylib/gyp/generator/make.py + @@ -200,6 +200,21 @@ + """ +- +- ++ ++ + + LINK_COMMANDS_AIX = """\ + + quiet_cmd_alink = AR($(TOOLSET)) $@ + + cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) $(ARFLAGS.$(TOOLSET)) $@ $(filter %.o,$^) +-+ +++ + + quiet_cmd_link = LINK($(TOOLSET)) $@ + + cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS) +-+ +++ + + quiet_cmd_solink = SOLINK($(TOOLSET)) $@ + + cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS) +-+ +++ + + quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ + + cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS) + + """ +-+ +-+ +++ +++ + # Header of toplevel Makefile. + # This should go into the build tree, but it's easier to keep it here for now. + SHARED_HEADER = ("""\ +@@ -39,14 +39,14 @@ + @@ -1933,6 +1948,10 @@ + cc_command=cc_host): + arflags_host = 'crsT' +- ++ + + if flavor == 'aix': + + arflags_target = '-Xany ' + arflags_target + + arflags_host = '-Xany ' + arflags_host +-+ +++ + return { 'ARFLAGS.target': arflags_target, + 'ARFLAGS.host': arflags_host } +- ++
	Added	mongodb-src-r2.4.10.tar.gz ^
	Added	mongodb-src-r2.4.14.tar.gz ^
[-] [+]	Changed	mongodb.conf ^
@@ -11,7 +11,8 @@ #port = 27017 # Bind the daemon to localhost only, comment out to allow remote connections. -bind_ip = 127.0.0.1 +bind_ip = 127.0.0.1,::1 +ipv6 = true # Location of the database files. dbpath = /var/lib/mongodb
[-] [+]	Changed	mongodb.init ^
@@ -49,6 +49,9 @@ numactl="" fi +# avoid hitting virtual memory limits with mmaps (bnc#876326) +ulimit -v unlimited + # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg.
[-] [+]	Changed	mongodb.logrotate ^
@@ -1,6 +1,7 @@ /var/log/mongodb/*.log { weekly rotate 10 + su mongodb mongodb copytruncate delaycompress compress
[-] [+]	Added	mongodb.service ^
@@ -0,0 +1,20 @@ +[Unit] +Description=High-performance, schema-free document-oriented database +After=syslog.target network.target + +[Service] +Type=forking +User=mongodb +Group=mongodb +Environment=CONFIG=/etc/mongodb.conf +Environment=OPTIONS= +EnvironmentFile=-/etc/sysconfig/mongodb +ExecStart=/usr/sbin/mongod -f $CONFIG $OPTIONS +PrivateTmp=true +LimitNOFILE=65536 +TimeoutStartSec=180 +StandardOutput=syslog +StandardError=syslog + +[Install] +WantedBy=multi-user.target