<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aa2364a6bbd7cfcd787e23278bd45edbac46f625">https://github.com/macports/macports-ports/commit/aa2364a6bbd7cfcd787e23278bd45edbac46f625</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 aa2364a alps: update to 2.3.0, use Boost port and review available variants.
</span>aa2364a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aa2364a6bbd7cfcd787e23278bd45edbac46f625
</span>Author: Michele Dolfi <dolfim@phys.ethz.ch>
AuthorDate: Tue Jan 17 14:50:09 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> alps: update to 2.3.0, use Boost port and review available variants.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Clang is better supported in the new release and the current Boost port is supported
</span><span style='display:block; white-space:pre;color:#404040;'> by alps 2.3.0.
</span><span style='display:block; white-space:pre;color:#404040;'> For matching the Boost compiler variants I needed to enable the compilers PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'> which conflicts with the mpi PortGroup, hence the manual definition of openmpi and
</span><span style='display:block; white-space:pre;color:#404040;'> mpich variants.
</span><span style='display:block; white-space:pre;color:#404040;'> Python 3 would also work, but it requires Boost >= 1.63.0.
</span>---
science/alps/Portfile | 80 ++++++++++++++--------
science/alps/files/patch-CMakeLists.txt.diff | 20 ------
...patch-applications-dmft-qmc-CMakeLists.txt.diff | 13 ++++
.../alps/files/patch-config-FindLapack.cmake.diff | 11 ---
4 files changed, 65 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/alps/Portfile b/science/alps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ec5297..72046bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/alps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/alps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,15 +3,15 @@
</span> PortSystem 1.0
PortGroup cmake 1.0
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup mpi 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compilers 1.0
</span>
name alps
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science
platforms darwin
license Restrictive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://alps.comp-phys.org/static/software/ALPS/LICENSE.txt/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# http://alps.comp-phys.org/static/software/ALPS/LICENSE.txt
</span> maintainers gmail.com:gamperl openmaintainer
description Algorithms and Libraries for Physics Simulations
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,32 +24,29 @@ long_description The ALPS project (Algorithms and Libraries for Physics S
</span>
homepage http://alps.comp-phys.org/
master_sites ${homepage}static/software/releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-${version}-r6176-src-with-boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-${version}-src
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f2ab3938a364a026be8557406427521901091a51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 554841986ad5a9d5d5a89941e5665c249fe1b8eba537078001bb6c5c21a1f335
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1fee73ada0aa7e9851801f6d6caffe75d60d485d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e64208d1e5acdd6f569277413c4867e1fa366cf4a224570eacbf1e9939fca2d2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:hdf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-mpi.enforce_variant hdf5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# alps has its own internal boost it wants to use, and fails if MacPorts' newer boost is active.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts_build boost
</span>
compilers.choose cc cxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang doesn't work for +applications or with MPI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mpi.setup -clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# replace ancient llvm we would otherwise be using by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![c_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +${compilers.gcc_default}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.enforce_c boost
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-config-FindLapack.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-applications-dmft-qmc-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {([c_variant_isset] && [clang_variant_isset] && ${configure.cxx_stdlib} eq "libc++") || (![c_variant_isset] && [string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} eq "libc++")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_CXX_FLAGS=\"-std=c++11\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args-delete -DCMAKE_SYSTEM_PREFIX_PATH=\"${prefix}\;/usr\"
configure.args-append -DCMAKE_SYSTEM_PREFIX_PATH=\"/usr\;${prefix}\" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBoost_ROOT_DIR:PATH=${worksrcpath}/boost \
</span> -DALPS_BUILD_TESTS=OFF \
-DALPS_INCLUDE_TUTORIALS=OFF \
-DALPS_BOOST_LIBRARY_NAME=alps-boost \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,19 +65,46 @@ configure.post_args ./alps
</span> use_parallel_build yes
variant applications description {compile ALPS with applications} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # alps/applications/dmrg/dmrg/dmrg.h:610:49: error: expected expression
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # std::string name = simplify_name(it->get<1>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ^
</span> configure.args-delete -DALPS_BUILD_APPLICATIONS=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DALPS_ENABLE_MPI=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DMPI_C=${mpi.cc} -DMPI_CXX=${mpi.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Mixing mpi and compilers portgroup created problems, so we define the mpi variants manually
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openmpi conflicts mpich description "Add MPI parallelization using OpenMPI" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c_variant [c_variant_name]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${c_variant} == ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_port openmpi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_suffix mp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_port openmpi-${c_variant}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_suffix ${c_variant}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost openmpi {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${mpi_port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.enforce_c ${mpi_port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DALPS_ENABLE_MPI=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DMPI_C=mpicc-openmpi-${mpi_suffix} -DMPI_CXX=mpicxx-openmpi-${mpi_suffix}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mpich conflicts openmpi description "Add MPI parallelization using MPICH" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c_variant [c_variant_name]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${c_variant} == ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_port mpich
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_suffix mp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_port mpich-${c_variant}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_suffix ${c_variant}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost mpich {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${mpi_port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.enforce_c ${mpi_port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DALPS_ENABLE_MPI=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DMPI_C=mpicc-mpich-${mpi_suffix} -DMPI_CXX=mpicxx-mpich-${mpi_suffix}
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# python 3 requires Boost 1.63 which is not yet in Macport
</span> set pythons_suffixes {26 27}
set pythons_ports {}
foreach s ${pythons_suffixes} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/alps/files/patch-CMakeLists.txt.diff b/science/alps/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7e37166..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/alps/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alps/CMakeLists.txt.orig 2015-10-13 12:32:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alps/CMakeLists.txt 2015-10-13 12:32:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #maintenance building options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--include (CMakeDetermineSystem)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include (CMakeDetermineSystem)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include (CMakeDetermineFortranCompiler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #message (STATUS "Fortran compiler: ${CMAKE_Fortran_COMPILER}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include (CMakeTestFortranCompiler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -318,7 +318,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(NOT WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif (NOT ALPS_FOR_VISTRAILS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(MAC_VECLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(LAPACK_LDFLAGS "-framework vecLib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(LAPACK_LDFLAGS "-framework Accelerate")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(MAC_VECLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LAPACK_LINKER_FLAGS ${LAPACK_LDFLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/alps/files/patch-applications-dmft-qmc-CMakeLists.txt.diff b/science/alps/files/patch-applications-dmft-qmc-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a2743f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/alps/files/patch-applications-dmft-qmc-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: alps/applications/dmft/qmc/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- alps/applications/dmft/qmc/CMakeLists.txt (revision 7830)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ alps/applications/dmft/qmc/CMakeLists.txt (working copy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS hirschfye RUNTIME DESTINATION bin COMPONENT applications)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS hybridization RUNTIME DESTINATION bin COMPONENT applications)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS interaction RUNTIME DESTINATION bin COMPONENT applications)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES hybridization/Documentation/hybdoc.pdf DESTINATION doc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(FILES hybridization/Documentation/hybdoc.pdf DESTINATION share/alps)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(LAPACK_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "dmft will not be built since the lapack library has not been found")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/alps/files/patch-config-FindLapack.cmake.diff b/science/alps/files/patch-config-FindLapack.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3fb2069..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/alps/files/patch-config-FindLapack.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alps/config/FindLapack.cmake.orig 2015-10-13 12:54:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alps/config/FindLapack.cmake 2015-10-13 12:54:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,7 +108,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(NOT HAVE_MKL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -framework vecLib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -framework Accelerate")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(LAPACK_LIBRARY_INIT 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(MAC_VECLIB 1 CACHE BOOL "use Mac Framework")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(LAPACK_LIBRARY "")
</span></pre><pre style='margin:0'>
</pre>