[114247] trunk/dports/databases/rethinkdb

[cal at macports.org]

Revision: 114247
          https://trac.macports.org/changeset/114247
Author:   cal at macports.org
Date:     2013-12-03 06:19:03 -0800 (Tue, 03 Dec 2013)
Log Message:
-----------
rethinkdb: another attempt at fixing compilation on systems < darwin13 by falling back to FSF GCC and libstdc++ from MacPorts

Also see https://lists.macosforge.org/pipermail/macports-dev/2013-December/025360.html, which explains the problem.

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

Removed Paths:
-------------
    trunk/dports/databases/rethinkdb/files/patch-configure-use_default_stdlib.diff

Modified: trunk/dports/databases/rethinkdb/Portfile
===================================================================
--- trunk/dports/databases/rethinkdb/Portfile	2013-12-03 13:37:35 UTC (rev 114246)
+++ trunk/dports/databases/rethinkdb/Portfile	2013-12-03 14:19:03 UTC (rev 114247)
@@ -44,10 +44,18 @@
 # Xcode 3.2.x included clang but not clang++, so it used llvm-g++-4.2 instead.
 compiler.blacklist-append {clang < 137}
 
+platform darwin {
+    if {${os.major} < 13} {
+        # When protobuf-cpp and v8 are compiled against libstdc++, don't use
+        # clang, which only supports C++11 (required by rethinkdb) when using
+        # libc++.
+        compiler.blacklist-append *clang*
+    }
+}
+
 # v8 >= 3.21 compatibility from upstream
 patch.pre_args      -p1
-patchfiles          3cf9e7bf13e5f0f364aecf0913e09d704e9688d2.patch \
-                    patch-configure-use_default_stdlib.diff
+patchfiles          3cf9e7bf13e5f0f364aecf0913e09d704e9688d2.patch
 
 set webresdir       ${prefix}/share/${name}/web
 build.args          DEBUG=0 ALLOW_WARNINGS=1 BUILD_DIR=build WEBRESDIR=${webresdir}

Deleted: trunk/dports/databases/rethinkdb/files/patch-configure-use_default_stdlib.diff
===================================================================
--- trunk/dports/databases/rethinkdb/files/patch-configure-use_default_stdlib.diff	2013-12-03 13:37:35 UTC (rev 114246)
+++ trunk/dports/databases/rethinkdb/files/patch-configure-use_default_stdlib.diff	2013-12-03 14:19:03 UTC (rev 114247)
@@ -1,17 +0,0 @@
---- a/configure	2013-12-03 13:47:35.000000000 +0100
-+++ b/configure	2013-12-03 13:47:52.000000000 +0100
-@@ -77,14 +77,6 @@
-     require "Use ccache"
-     boolvar USE_CCACHE $use_ccache
-     check_cxx
--    if [ "$COMPILER" = CLANG ]; then
--        require stdlib
--        case "$OS" in
--            Darwin) var_append LDFLAGS -lc++
--                    var_append CXXFLAGS -stdlib=libc++ ;;
--            *) var_append LDFLAGS -lstdc++ ;;
--        esac
--    fi
-     require "Precompiled web assets"
-     if [[ -z "$enable_precompiled_web" ]]; then
-         if test -d precompiled/web; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131203/405e1f7b/attachment-0001.html>