[113213] trunk/dports/python/py-graph-tool/Portfile

[mmoll at macports.org]

Revision: 113213
          https://trac.macports.org/changeset/113213
Author:   mmoll at macports.org
Date:     2013-11-12 06:08:13 -0800 (Tue, 12 Nov 2013)
Log Message:
-----------
py-graph-tool: temporarily switch to a git revision to get a large number of C++11 fixes necessary for libc++ / OS X 10.9

Modified Paths:
--------------
    trunk/dports/python/py-graph-tool/Portfile

Modified: trunk/dports/python/py-graph-tool/Portfile
===================================================================
--- trunk/dports/python/py-graph-tool/Portfile	2013-11-12 14:05:14 UTC (rev 113212)
+++ trunk/dports/python/py-graph-tool/Portfile	2013-11-12 14:08:13 UTC (rev 113213)
@@ -8,6 +8,7 @@
 set realname        graph-tool
 name                py-${realname}
 version             2.2.26
+revision            1
 categories          python science
 platforms           darwin
 license             GPL-3
@@ -19,11 +20,17 @@
                     the Boost Graph Library.
 homepage            http://graph-tool.skewed.de
 master_sites        http://downloads.skewed.de/graph-tool/
-use_bzip2           yes
-checksums           md5     317b29de0d3ef715fdc9281e078cfb17 \
-                    sha1    108be4cf6212eb6886f172ea03813187f73e4c3c \
-                    rmd160  cd2e8506522821750d70a97b951254f0a133d218
-distname            ${realname}-${version}
+# temporarily use git revision with C++11 fixes, so that code compiles on OS X 10.9
+#use_bzip2           yes
+#checksums           md5     317b29de0d3ef715fdc9281e078cfb17 \
+#                    sha1    108be4cf6212eb6886f172ea03813187f73e4c3c \
+#                    rmd160  cd2e8506522821750d70a97b951254f0a133d218
+#distname            ${realname}-${version}
+fetch.type          git
+git.url             git://git.skewed.de/graph-tool
+git.branch          26cdde1e6081f031b24311ece2cf63df6a45f30b
+
+
 python.versions     26 27 32 33
 python.default_version 27
 
@@ -41,6 +48,7 @@
                        port:py${python.version}-gobject3 \
                        port:py${python.version}-cairo
     use_configure      yes
+    configure.cmd      ./autogen.sh && ./configure
     # parallel build starts swapping, even on a MacBook Pro with 8GB of RAM.
     use_parallel_build no
 
@@ -57,16 +65,16 @@
     configure.cppflags-append -I${prefix}/include -I${python.include}/..
     configure.ldflags-append -L${prefix}/lib
     configure.args-append --with-boost=${prefix} --exec-prefix=${python.prefix}
-    # Clang uses the old libstc++ from gcc 4.2 by default. Boost doesn't
+    # Clang uses the old libstc++ from gcc 4.2 before OS X 10.9. Boost doesn't
     # include some of the tr1 headers in libstdc++ and defines its own tr1
     # classes. This causes conflicts with sparsehash which insists on using
-    # the old tr1 headers. Remove this if/when clang switches to libc++ at
-    # some point.
-    if {[string match *clang* ${configure.compiler}]} {
-        configure.args-append --disable-sparsehash
-    } else {
+    # the old tr1 headers.
+    if {[string match *gcc* ${configure.compiler}] ||
+        ${os.major} >= 13 && ${os.platform} == "darwin"} {
         depends_lib-append port:sparsehash
         configure.cppflags-append -I${prefix}/include/sparsehash
+    } else {
+        configure.args-append --disable-sparsehash
     }
     build.cmd          make
     build.target       all
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131112/5dce76a5/attachment-0001.html>