<pre style='margin:0'>
Jeremy Lavergne (nerdling) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6493ca31eae6fcff5ea7ef906366077eaa5ac262">https://github.com/macports/macports-ports/commit/6493ca31eae6fcff5ea7ef906366077eaa5ac262</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6493ca31eae py-igraph: update dependencies
</span>6493ca31eae is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6493ca31eae6fcff5ea7ef906366077eaa5ac262
</span>Author: Szabolcs Horvát <szhorvat@gmail.com>
AuthorDate: Sun Mar 7 10:01:09 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-igraph: update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies given the changes in python-igraph 0.9
</span><span style='display:block; white-space:pre;color:#404040;'> * build with external (instead of bundled) dependencies when appropriate
</span><span style='display:block; white-space:pre;color:#404040;'> * remove py27 subport as Python 2.7 is no longer supported
</span><span style='display:block; white-space:pre;color:#404040;'> * remove variants
</span><span style='display:block; white-space:pre;color:#404040;'> * See: https://trac.macports.org/ticket/62399
</span>---
python/py-igraph/Portfile | 50 +++++++++++-------------
python/py-igraph/files/patch-cmake-args-fix.diff | 26 ++++++++++++
2 files changed, 49 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-igraph/Portfile b/python/py-igraph/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 094b09b1fc1..4d4408143ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-igraph/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-igraph/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,12 @@ PortGroup python 1.0
</span> name py-igraph
python.rootname python-igraph
version 0.9.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append math science
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 36 37 38 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 36 37 38 39
</span>
maintainers {snc @nerdling} {gmail.com:szhorvat @szhorvat} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,49 +23,44 @@ long_description Python interface to the igraph library for network analysis
</span>
homepage https://igraph.org/python/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums rmd160 65a9ec40c2ea67786aba9fe79844e061425bbdac \
sha256 7aa1d77fa02e27475eb4f14503f3cb342c3ed8990d9224640fd29c70797f2dd6 \
size 3366754
if {${name} ne ${subport}} {
depends_lib-append port:py${python.version}-texttable \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:arpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glpk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_CXSparse
</span>
depends_build-append port:py${python.version}-setuptools \
path:bin/cmake:cmake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span> port:bison \
port:flex
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant external_glpk description {Build with external GLPK} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:glpk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant external_linalg description {Build with external BLAS, LAPACK, ARPACK} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:lapack port:arpack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +external_glpk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set extra_configure_args { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset external_glpk]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend extra_configure_args --with-external-glpk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset external_linalg]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend extra_configure_args --with-external-blas --with-external-lapack --with-external-arpack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-cmake-args-fix.diff
</span>
post-patch {
reinplace "s|-Werror |-Werror -Wno-unused-function |g" ${worksrcpath}/vendor/source/igraph/etc/cmake/compilers.cmake
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append IGRAPH_EXTRA_CONFIGURE_ARGS=[join $extra_configure_args]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set extra_cmake_args {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_CCACHE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_SHARED_LIBS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIGRAPH_ENABLE_LTO=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIGRAPH_GLPK_SUPPORT=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIGRAPH_GRAPHML_SUPPORT=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIGRAPH_USE_INTERNAL_ARPACK=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIGRAPH_USE_INTERNAL_BLAS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIGRAPH_USE_INTERNAL_CXSPARSE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIGRAPH_USE_INTERNAL_GLPK=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIGRAPH_USE_INTERNAL_GMP=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIGRAPH_USE_INTERNAL_LAPACK=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLA_VENDOR=Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append IGRAPH_CMAKE_EXTRA_ARGS=[join $extra_cmake_args]
</span>
pre-test {
test.env PYTHONPATH=[glob -nocomplain ${worksrcpath}/build/lib*]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-igraph/files/patch-cmake-args-fix.diff b/python/py-igraph/files/patch-cmake-args-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..322acb924ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-igraph/files/patch-cmake-args-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.orig.py 2021-02-25 20:12:21.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-03-07 09:49:56.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,18 +243,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print("Configuring build...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = [cmake]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Add any extra CMake args from environment variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if "IGRAPH_CMAKE_EXTRA_ARGS" in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.extend(shlex.split(os.environ["IGRAPH_CMAKE_EXTRA_ARGS"]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build the Python interface with vendored libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for deps in "ARPACK BLAS CXSPARSE GLPK LAPACK".split():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for deps in "ARPACK BLAS CXSPARSE GLPK GMP LAPACK".split():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.append("-DIGRAPH_USE_INTERNAL_" + deps + "=ON")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -fPIC is needed on Linux so we can link to a static igraph lib from a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python shared library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.append("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Add any extra CMake args from environment variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if "IGRAPH_CMAKE_EXTRA_ARGS" in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.extend(shlex.split(os.environ["IGRAPH_CMAKE_EXTRA_ARGS"]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Finally, add the source folder path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.append(str(build_to_source_folder))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>