<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146442] trunk/dports/databases/mongodb/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146442">146442</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-03-07 10:14:37 -0800 (Mon, 07 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mongodb: remove universal variant and support for i386; mongodb 3.2.x supports x86_64 only</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesmongodbPortfile">trunk/dports/databases/mongodb/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabasesmongodbPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mongodb/Portfile (146441 => 146442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mongodb/Portfile 2016-03-07 17:58:18 UTC (rev 146441)
+++ trunk/dports/databases/mongodb/Portfile 2016-03-07 18:14:37 UTC (rev 146442)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx"> PortGroup conflicts_build 1.0
</span><span class="cx"> PortGroup cxx11 1.0
</span><del>-PortGroup muniversal 1.0
</del><span class="cx">
</span><span class="cx"> name mongodb
</span><span class="cx"> epoch 1
</span><span class="lines">@@ -34,19 +33,6 @@
</span><span class="cx">
</span><span class="cx"> license_noconflict scons
</span><span class="cx">
</span><del>-pre-extract {
- if {${build_arch} eq "i386"} {
- ui_error "Building ${subport} @${version} for ${build_arch} currently fails."
- ui_error "See https://jira.mongodb.org/browse/SERVER-22810"
- return -code error "incompatible architecture"
- }
- if {[variant_isset universal]} {
- ui_error "Building ${subport} @${version} with the universal variant currently fails."
- ui_error "See https://jira.mongodb.org/browse/SERVER-22810"
- return -code error "incompatible architecture"
- }
-}
-
</del><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="cx"> # mongodb 3.0.5 and later requires C++11. Forcing the use of libc++ is
</span><span class="lines">@@ -64,29 +50,25 @@
</span><span class="cx"> build.cmd ${prefix}/bin/scons
</span><span class="cx"> build.target all mongobridge mongosniff
</span><span class="cx"> build.args CC="${configure.cc}" \
</span><ins>+ CCFLAGS="${configure.cc_archflags}" \
</ins><span class="cx"> CPPPATH="${prefix}/include" \
</span><span class="cx"> CXX="${configure.cxx}" \
</span><span class="cx"> LIBPATH="${prefix}/lib" \
</span><ins>+ LINKFLAGS="${configure.ld_archflags}" \
+ TARGET_ARCH=${build_arch} \
</ins><span class="cx"> --disable-warnings-as-errors \
</span><span class="cx"> --libc++ \
</span><span class="cx"> --osx-version-min=${macosx_deployment_target} \
</span><del>- --ssl
</del><ins>+ --ssl \
+ --wiredtiger=on
</ins><span class="cx">
</span><span class="cx"> # Specify a short variant dir because the default variant dir is deeply nested
</span><span class="cx"> # and can be very long, so long that on some systems the build will fail with
</span><span class="cx"> # "Argument list too long"; see https://jira.mongodb.org/browse/SERVER-13829
</span><span class="cx"> build.args-append VARIANT_DIR=MP
</span><span class="cx">
</span><del>-supported_archs i386 x86_64
-lappend merger_build_args(x86_64) --wiredtiger=on
-lappend merger_build_args(i386) --wiredtiger=off
-foreach arch ${supported_archs} {
- lappend merger_build_args(${arch}) CCFLAGS='-arch ${arch}' LINKFLAGS='-arch ${arch}' TARGET_ARCH=${arch}
- lappend merger_destroot_args(${arch}) {*}$merger_build_args(${arch})
-}
-if {![variant_isset universal] && [info exists merger_build_args(${build_arch})]} {
- build.args-append {*}$merger_build_args(${build_arch})
-}
</del><ins>+# https://jira.mongodb.org/browse/SERVER-22810
+supported_archs x86_64
</ins><span class="cx">
</span><span class="cx"> destroot.args {*}${build.args}
</span><span class="cx"> destroot.destdir --prefix=${destroot}${prefix}
</span><span class="lines">@@ -97,9 +79,6 @@
</span><span class="cx"> add_users ${mongouser} group=${mongouser} realname=MongoDB\ Server
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- if {[variant_isset universal]} {
- system -W ${worksrcpath} "lipo -create ${worksrcpath}-i386/mongobridge ${worksrcpath}-x86_64/mongobridge -output mongobridge"
- }
</del><span class="cx"> xinstall -W ${worksrcpath} mongobridge ${destroot}${prefix}/bin
</span><span class="cx">
</span><span class="cx"> xinstall -m 755 -o ${mongouser} -g ${mongouser} -d \
</span></span></pre>
</div>
</div>
</body>
</html>