<pre style='margin:0'>
Adam Mercer (skymoo) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/994f715a5db1d50cd855e751cf9db5cfba3b8e1c">https://github.com/macports/macports-ports/commit/994f715a5db1d50cd855e751cf9db5cfba3b8e1c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 994f715a5db1d50cd855e751cf9db5cfba3b8e1c
</span>Author: Duncan Macleod <duncan.macleod@ligo.org>
AuthorDate: Mon Dec 17 11:14:27 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> lalinference: reworked configure args and dependencies
</span>---
science/lalinference/Portfile | 48 +++++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalinference/Portfile b/science/lalinference/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf9c1e0..c549721 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalinference/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalinference/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name lalinference
version 1.10.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
description LSC Algorithm Library - Inference
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,15 +34,21 @@ depends_lib port:gsl \
</span> if {[string match "py*" ${subport}]} {
set numbers [regexp -all -inline -- {[0-9]+} ${subport}]
set v [lindex ${numbers} 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${v}-astropy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${v}-healpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${v}-shapely
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ideally we need to depend on this, but this brings in py27-tables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which is not compatible with port:hdf, which is a required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # upstream dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #depends_lib-append port:py${v}-seaborn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # bump revision for python subports only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # python, C-library port, and numpy are automatically added below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:py${v}-lal port:py${v}-lalmetaio port:py${v}-lalsimulation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${v}-lalburst port:py${v}-lalinspiral port:py${v}-lalpulsar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${v}-scipy port:py${v}-lscsoft-glue port:py${v}-healpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${v}-astropy port:py${v}-matplotlib port:py${v}-h5py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${v}-shapely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</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;'>+# add Octave dependencies for octave subports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match "octave-*" ${subport}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # octave, and C-library port are automatically added below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:octave-lal port:octave-lalmetaio port:octave-lalsimulation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:octave-lalburst port:lalinspiral port:lalpulsar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> }
configure.args --enable-openmp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,20 +89,19 @@ use_xz yes
</span> depends_build-append \
port:pkgconfig \
port:swig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span>
# Choose a compiler that supports OpenMP.
compiler.whitelist macports-clang-6.0 macports-clang-5.0 macports-clang-4.0 macports-clang-7.0 macports-clang-3.9
compiler.fallback macports-clang-6.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set default_pythonarg PYTHON=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
</span> configure.args-append \
--mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
--enable-swig-iface \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${default_pythonarg}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-swig-octave \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-swig-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-python
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,14 +119,13 @@ foreach v {27 35 36 37} {
</span> long_description ${long_description} This package provides Python \
${pythonversion} bindings, modules, and scripts.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:swig-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-replace port:python27 port:python${v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-strsed g/port:lal/port:py${v}-lal/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name} port:py${v}-numpy port:py${v}-scipy port:py${v}-lscsoft-glue port:py${v}-healpy port:py${v}-astropy port:py${v}-matplotlib port:py${v}-h5py port:py${v}-shapely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-prepend port:python${v} port:${name} port:py${v}-numpy
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace ${default_pythonarg} PYTHON=${pythonhome}/bin/python${pythonversion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-swig-python --enable-swig-python
</span>
destroot.args-append pythondir="${pythondir}" \
pyexecdir="${pythondir}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,10 +166,9 @@ subport octave-${name} {
</span> bindings, modules, and scripts.
depends_build-append port:swig-octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-strsed g/port:lal/port:octave-lal/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name} port:octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-prepend port:octave port:${name}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-swig-octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-swig-octave --enable-swig-octave
</span>
# Only install SWIG bindings, Python libraries, and Python scripts
destroot {
</pre><pre style='margin:0'>
</pre>