[146442] trunk/dports/databases/mongodb/Portfile

[ryandesign at macports.org]

Revision: 146442
          https://trac.macports.org/changeset/146442
Author:   ryandesign at macports.org
Date:     2016-03-07 10:14:37 -0800 (Mon, 07 Mar 2016)
Log Message:
-----------
mongodb: remove universal variant and support for i386; mongodb 3.2.x supports x86_64 only

Modified Paths:
--------------
    trunk/dports/databases/mongodb/Portfile

Modified: trunk/dports/databases/mongodb/Portfile
===================================================================
--- 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)
@@ -5,7 +5,6 @@
 PortGroup           compiler_blacklist_versions 1.0
 PortGroup           conflicts_build 1.0
 PortGroup           cxx11 1.0
-PortGroup           muniversal 1.0
 
 name                mongodb
 epoch               1
@@ -34,19 +33,6 @@
 
 license_noconflict  scons
 
-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"
-    }
-}
-
 use_configure       no
 
 # mongodb 3.0.5 and later requires C++11. Forcing the use of libc++ is
@@ -64,29 +50,25 @@
 build.cmd           ${prefix}/bin/scons
 build.target        all mongobridge mongosniff
 build.args          CC="${configure.cc}" \
+                    CCFLAGS="${configure.cc_archflags}" \
                     CPPPATH="${prefix}/include" \
                     CXX="${configure.cxx}" \
                     LIBPATH="${prefix}/lib" \
+                    LINKFLAGS="${configure.ld_archflags}" \
+                    TARGET_ARCH=${build_arch} \
                     --disable-warnings-as-errors \
                     --libc++ \
                     --osx-version-min=${macosx_deployment_target} \
-                    --ssl
+                    --ssl \
+                    --wiredtiger=on
 
 # Specify a short variant dir because the default variant dir is deeply nested
 # and can be very long, so long that on some systems the build will fail with
 # "Argument list too long"; see https://jira.mongodb.org/browse/SERVER-13829
 build.args-append   VARIANT_DIR=MP
 
-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})
-}
+# https://jira.mongodb.org/browse/SERVER-22810
+supported_archs     x86_64
 
 destroot.args       {*}${build.args}
 destroot.destdir    --prefix=${destroot}${prefix}
@@ -97,9 +79,6 @@
 add_users           ${mongouser} group=${mongouser} realname=MongoDB\ Server
 
 post-destroot {
-    if {[variant_isset universal]} {
-        system -W ${worksrcpath} "lipo -create ${worksrcpath}-i386/mongobridge ${worksrcpath}-x86_64/mongobridge -output mongobridge"
-    }
     xinstall -W ${worksrcpath} mongobridge ${destroot}${prefix}/bin
 
     xinstall -m 755 -o ${mongouser} -g ${mongouser} -d \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160307/f85b9ac2/attachment.html>