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

mmoll at macports.org mmoll at macports.org
Wed Nov 13 11:54:31 PST 2013


Revision: 113340
          https://trac.macports.org/changeset/113340
Author:   mmoll at macports.org
Date:     2013-11-13 11:54:31 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
py-graph-tool: revert to official release on <=10.8, use git snapshot only on 10.9. Git snapshot doesn't work on <=10.8

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-13 19:39:48 UTC (rev 113339)
+++ trunk/dports/python/py-graph-tool/Portfile	2013-11-13 19:54:31 UTC (rev 113340)
@@ -8,7 +8,7 @@
 set realname        graph-tool
 name                py-${realname}
 version             2.2.26
-revision            2
+revision            3
 categories          python science
 platforms           darwin
 license             GPL-3
@@ -20,17 +20,18 @@
                     the Boost Graph Library.
 homepage            http://graph-tool.skewed.de
 master_sites        http://downloads.skewed.de/graph-tool/
-# 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
+use_bzip2           yes
+checksums           md5     317b29de0d3ef715fdc9281e078cfb17 \
+                    sha1    108be4cf6212eb6886f172ea03813187f73e4c3c \
+                    rmd160  cd2e8506522821750d70a97b951254f0a133d218
+distname            ${realname}-${version}
+platform darwin 13 {
+    # temporarily use git revision with C++11 fixes, so that code compiles on OS X 10.9
+    fetch.type          git
+    git.url             git://git.skewed.de/graph-tool
+    git.branch          26cdde1e6081f031b24311ece2cf63df6a45f30b
+}
 
-
 python.versions     26 27 32 33
 python.default_version 27
 
@@ -48,9 +49,12 @@
                        port:py${python.version}-gobject3 \
                        port:py${python.version}-cairo
     use_configure      yes
-    # remove when switching back to official release which includes "configure"
-    depends_build-append port:libtool port:autoconf port:automake
-    configure.cmd      ./autogen.sh && ./configure
+    configure.cmd      ./configure
+    if {${os.major} >= 13 && ${os.platform} == "darwin"} {
+        # remove when switching back to official release which includes "configure"
+        depends_build-append port:libtool port:autoconf port:automake
+        configure.cmd      ./autogen.sh && ./configure
+    }
     # parallel build starts swapping, even on a MacBook Pro with 8GB of RAM.
     use_parallel_build no
 
@@ -67,10 +71,6 @@
     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}
-    configure.cxxflags-append -std=c++11
-    if {[string match *clang* ${configure.compiler}]} {
-        configure.cxxflags-append -stdlib=libc++
-    }
     # 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
@@ -82,7 +82,6 @@
     } else {
         configure.args-append --disable-sparsehash
     }
-    build.pre_args     V=1
     build.cmd          make
     build.target       all
     destroot.cmd       make
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/64d158a7/attachment.html>


More information about the macports-changes mailing list