Attachment 190266 Details for Bug 224303 – Clean patch, make it build with Boost 1.66

[patch] Clean patch, make it build with Boost 1.66

mongodb362.diff (text/plain), 11.92 KB, created by dev on 2018-02-02 11:30:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dev

Created: 2018-02-02 11:30:21 UTC

Size: 11.92 KB

patch

obsolete

>Index: databases/mongodb36/Makefile
>===================================================================
>--- databases/mongodb36/Makefile	(nonexistent)
>+++ databases/mongodb36/Makefile	(working copy)
>@@ -0,0 +1,71 @@
>+# $FreeBSD$
>+
>+PORTNAME=	mongodb
>+DISTVERSIONPREFIX=	r
>+DISTVERSION=	3.6.2
>+CATEGORIES=	databases net
>+MASTER_SITES=	https://fastdl.mongodb.org/src/ \
>+		http://fastdl.mongodb.org/src/ \
>+		http://download.mongodb.org/src/
>+PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
>+DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
>+
>+MAINTAINER=	galu@packetdam.com
>+COMMENT=	Distributed document-oriented "NoSQL" database
>+
>+# mongodb is AGPLv3, C++ driver is APACHE20
>+LICENSE=	AGPLv3 APACHE20
>+LICENSE_COMB=	multi
>+
>+ONLY_FOR_ARCHS=	amd64
>+ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 deprecated in v3)"
>+
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}typing>=3.6.2:devel/py-typing@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
>+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
>+		libpcre.so:devel/pcre \
>+		libsnappy.so:archivers/snappy
>+
>+CONFLICTS_BUILD=	mongo-cxx-driver
>+CONFLICTS_INSTALL=	mongodb[32-4]*
>+
>+USES=		compiler:c++14-lang cpe python:build scons shebangfix
>+USE_RC_SUBR=	mongod
>+
>+SHEBANG_FILES=	src/mongo/installer/compass/install_compass.in
>+MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
>+		--use-system-pcre --use-system-snappy \
>+		--use-system-boost --use-system-zlib \
>+		--cxx-std=14 --libc++ \
>+		--runtime-hardening=on \
>+		--disable-warnings-as-errors \
>+		VERBOSE=on
>+
>+WITH_DEBUG=	yes
>+
>+USERS=		mongodb
>+GROUPS=		mongodb
>+
>+OPTIONS_DEFINE=		SASL SSL
>+OPTIONS_DEFAULT=	SASL SSL
>+
>+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
>+SASL_MAKE_ARGS=		--use-sasl-client
>+
>+SSL_USES=	ssl
>+SSL_MAKE_ARGS=	--ssl
>+
>+ALL_TARGET=	core
>+
>+PORTSCOUT=	limitw:1,even
>+
>+CPE_PRODUCT=	mongodb
>+
>+post-install:
>+.for f in mongo mongod mongoperf mongos
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
>+.endfor
>+	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
>+
>+.include <bsd.port.mk>
>
>Property changes on: databases/mongodb36/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mongodb36/distinfo
>===================================================================
>--- databases/mongodb36/distinfo	(nonexistent)
>+++ databases/mongodb36/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1515676780
>+SHA256 (mongodb-src-r3.6.2.tar.gz) = 018788bd31d6953e55cda0ad0771d23e6b78e024a8a6404a80a900c67215b0a7
>+SIZE (mongodb-src-r3.6.2.tar.gz) = 39999539
>
>Property changes on: databases/mongodb36/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mongodb36/files/mongod.in
>===================================================================
>--- databases/mongodb36/files/mongod.in	(nonexistent)
>+++ databases/mongodb36/files/mongod.in	(working copy)
>@@ -0,0 +1,61 @@
>+#!/bin/sh
>+
>+# PROVIDE: mongod
>+# REQUIRE: NETWORK ldconfig
>+# KEYWORD: shutdown
>+#
>+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
>+# to enable this service:
>+#
>+# mongod_enable (bool):  Set to "NO" by default.
>+#                        Set it to "YES" to enable mongod.
>+# mongod_limits (bool):  Set to "NO" by default.
>+#                        Set it to yes to run `limits -e -U mongodb`
>+#                        just before mongod starts.
>+# mongod_dbpath (str):   Default to "/var/db/mongodb"
>+#                        Base database directory.
>+# mongod_flags (str):    Custom additional arguments to be passed to mongod.
>+#                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
>+# mongod_config (str):	 Default to "%%PREFIX%%/etc/mongodb.conf"
>+#                        Path to config file
>+#
>+
>+. /etc/rc.subr
>+
>+name="mongod"
>+rcvar=mongod_enable
>+
>+load_rc_config $name
>+
>+: ${mongod_enable="NO"}
>+: ${mongod_limits="NO"}
>+: ${mongod_dbpath="/var/db/mongodb"}
>+: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"}
>+: ${mongod_user="mongodb"}
>+: ${mongod_group="mongodb"}
>+: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
>+
>+pidfile="${mongod_dbpath}/mongod.lock"
>+command=%%PREFIX%%/bin/${name}
>+command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
>+start_precmd="${name}_prestart"
>+
>+mongod_create_dbpath()
>+{
>+        mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
>+        [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath}
>+}
>+
>+mongod_prestart()
>+{
>+        if [ ! -d ${mongod_dbpath} ]; then
>+                mongod_create_dbpath || return 1
>+        fi
>+        if checkyesno mongod_limits; then
>+                eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
>+        else
>+                return 0
>+        fi
>+}
>+
>+run_rc_command "$1"
>
>Property changes on: databases/mongodb36/files/mongod.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mongodb36/files/patch-SConstruct
>===================================================================
>--- databases/mongodb36/files/patch-SConstruct	(nonexistent)
>+++ databases/mongodb36/files/patch-SConstruct	(working copy)
>@@ -0,0 +1,48 @@
>+--- SConstruct.orig	2018-01-04 23:28:55 UTC
>++++ SConstruct
>+@@ -922,9 +922,9 @@ if has_option('variables-help'):
>+     print(env_vars.GenerateHelpText(env))
>+     Exit(0)
>+ 
>+-unknown_vars = env_vars.UnknownVariables()
>+-if unknown_vars:
>+-    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
>++#unknown_vars = env_vars.UnknownVariables()
>++#if unknown_vars:
>++#    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
>+ 
>+ def set_config_header_define(env, varname, varval = 1):
>+     env['CONFIG_HEADER_DEFINES'][varname] = varval
>+@@ -1612,7 +1612,7 @@ if env.TargetOSIs('posix'):
>+             # If runtime hardening is requested, then build anything
>+             # destined for an executable with the necessary flags for PIE.
>+             env.AppendUnique(
>+-                PROGCCFLAGS=['-fPIE'],
>++                PROGCCFLAGS=['-fpic'],
>+                 PROGLINKFLAGS=['-pie'],
>+             )
>+ 
>+@@ -1626,7 +1626,7 @@ if env.TargetOSIs('posix'):
>+                          "-Wno-unknown-pragmas",
>+                          "-Winvalid-pch"] )
>+     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
>+-    if env.TargetOSIs('linux', 'darwin', 'solaris'):
>++    if env.TargetOSIs('linux', 'darwin', 'solaris', 'freebsd'):
>+         if not has_option("disable-warnings-as-errors"):
>+             env.Append( CCFLAGS=["-Werror"] )
>+ 
>+@@ -1661,10 +1661,10 @@ if env.TargetOSIs('posix'):
>+         env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
>+         env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
>+ 
>+-    if optBuild:
>+-        env.Append( CCFLAGS=["-O2"] )
>+-    else:
>+-        env.Append( CCFLAGS=["-O0"] )
>++    #if optBuild:
>++    #    env.Append( CCFLAGS=["-O2"] )
>++    #else:
>++    #    env.Append( CCFLAGS=["-O0"] )
>+ 
>+     # Promote linker warnings into errors. We can't yet do this on OS X because its linker considers
>+     # noall_load obsolete and warns about it.
>
>Property changes on: databases/mongodb36/files/patch-SConstruct
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mongodb36/files/patch-rpm_mongod.conf
>===================================================================
>--- databases/mongodb36/files/patch-rpm_mongod.conf	(nonexistent)
>+++ databases/mongodb36/files/patch-rpm_mongod.conf	(working copy)
>@@ -0,0 +1,25 @@
>+--- rpm/mongod.conf.orig	2018-01-04 23:28:55 UTC
>++++ rpm/mongod.conf
>+@@ -7,11 +7,11 @@
>+ systemLog:
>+   destination: file
>+   logAppend: true
>+-  path: /var/log/mongodb/mongod.log
>++  path: /var/db/mongodb/mongod.log 
>+ 
>+ # Where and how to store data.
>+ storage:
>+-  dbPath: /var/lib/mongo
>++  dbPath: /var/db/mongodb 
>+   journal:
>+     enabled: true
>+ #  engine:
>+@@ -21,7 +21,7 @@ storage:
>+ # how the process runs
>+ processManagement:
>+   fork: true  # fork and run in background
>+-  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
>++  pidFilePath: /var/db/mongodb/mongod.lock  # location of pidfile
>+   timeZoneInfo: /usr/share/zoneinfo
>+ 
>+ # network interfaces
>
>Property changes on: databases/mongodb36/files/patch-rpm_mongod.conf
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
>===================================================================
>--- databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp	(nonexistent)
>+++ databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/mongo/db/repl/oplog_fetcher.cpp.orig	2018-01-18 12:18:49 UTC
>++++ src/mongo/db/repl/oplog_fetcher.cpp
>+@@ -245,7 +245,7 @@ StatusWith<boost::optional<rpc::OplogQue
>+         if (!metadataResult.isOK()) {
>+             return metadataResult.getStatus();
>+         }
>+-        oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
>++        oqMetadata = boost::make_optional(metadataResult.getValue());
>+     }
>+     return oqMetadata;
>+ }
>
>Property changes on: databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mongodb36/pkg-descr
>===================================================================
>--- databases/mongodb36/pkg-descr	(nonexistent)
>+++ databases/mongodb36/pkg-descr	(working copy)
>@@ -0,0 +1,5 @@
>+Mongo (from "humongous") is a high-performance, open source,
>+schema-free, document-oriented database. A common name in the
>+"NOSQL" community.
>+
>+WWW: https://www.mongodb.com/
>
>Property changes on: databases/mongodb36/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mongodb36/pkg-plist
>===================================================================
>--- databases/mongodb36/pkg-plist	(nonexistent)
>+++ databases/mongodb36/pkg-plist	(working copy)
>@@ -0,0 +1,6 @@
>+bin/install_compass
>+bin/mongo
>+bin/mongod
>+bin/mongoperf
>+bin/mongos
>+@sample etc/mongodb.conf.sample
>
>Property changes on: databases/mongodb36/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 224303: 188781 | 189075 | 189962 | 190266