[114246] trunk/dports/databases/rethinkdb
cal at macports.org
cal at macports.org
Tue Dec 3 05:37:36 PST 2013
Revision: 114246
https://trac.macports.org/changeset/114246
Author: cal at macports.org
Date: 2013-12-03 05:37:35 -0800 (Tue, 03 Dec 2013)
Log Message:
-----------
rethinkdb: Use compiler's default stdlib (or the one specified by MacPorts when running trunk), should fix build on <= ML, no revbump because it either worked so far or was broken because of a stdlib mismatch between symbols in libprotobuf.dylib and the ones expected from the protobuf headers.
Modified Paths:
--------------
trunk/dports/databases/rethinkdb/Portfile
Added 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 12:38:39 UTC (rev 114245)
+++ trunk/dports/databases/rethinkdb/Portfile 2013-12-03 13:37:35 UTC (rev 114246)
@@ -46,7 +46,8 @@
# v8 >= 3.21 compatibility from upstream
patch.pre_args -p1
-patchfiles 3cf9e7bf13e5f0f364aecf0913e09d704e9688d2.patch
+patchfiles 3cf9e7bf13e5f0f364aecf0913e09d704e9688d2.patch \
+ patch-configure-use_default_stdlib.diff
set webresdir ${prefix}/share/${name}/web
build.args DEBUG=0 ALLOW_WARNINGS=1 BUILD_DIR=build WEBRESDIR=${webresdir}
Added: trunk/dports/databases/rethinkdb/files/patch-configure-use_default_stdlib.diff
===================================================================
--- trunk/dports/databases/rethinkdb/files/patch-configure-use_default_stdlib.diff (rev 0)
+++ trunk/dports/databases/rethinkdb/files/patch-configure-use_default_stdlib.diff 2013-12-03 13:37:35 UTC (rev 114246)
@@ -0,0 +1,17 @@
+--- 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/7c5decdc/attachment.html>
More information about the macports-changes
mailing list