<pre style='margin:0'>
tenomoto pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6aa77691a3ad8b16b2f0c2d4f911435c1bb541b9">https://github.com/macports/macports-ports/commit/6aa77691a3ad8b16b2f0c2d4f911435c1bb541b9</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 6aa7769 lapack: update to 3.6.1. fix build of CBLAS and LAPACKE due to CMake FortranCInterface
</span>6aa7769 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6aa77691a3ad8b16b2f0c2d4f911435c1bb541b9
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sun Nov 13 07:00:04 2016 +0900
<span style='display:block; white-space:pre;color:#404040;'> lapack: update to 3.6.1. fix build of CBLAS and LAPACKE due to CMake FortranCInterface
</span>---
math/lapack/Portfile | 21 +++++++++++++--------
math/lapack/files/patch-CMakeLists.txt.diff | 12 ++++++------
math/lapack/files/patch-lapack.pc.in.diff | 12 ------------
3 files changed, 19 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/lapack/Portfile b/math/lapack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e0c76c4..656d8e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/lapack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/lapack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# $Id: Portfile 146883 2016-03-19 13:03:09Z takeshi@macports.org $
</span>
PortSystem 1.0
PortGroup cmake 1.0
PortGroup compilers 1.0
name lapack
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.1
</span> categories math devel science
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +20,8 @@ long_description \
</span> homepage http://www.netlib.org/${name}/
master_sites ${homepage}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a92d0d869e42cf5835039b043e613e323b069f04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a9a0082c918fe14e377bbd570057616768dca76cbdc713457d8199aaa233ffc3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 227e893b3716286d405e683ad0e29df475c9ebde \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 888a50d787a9d828074db581c80b2d22bdb91435a673b1bf6cd6eb51aa50d1de
</span> extract.suffix .tgz
compilers.choose cc fc f77 f90
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,15 +29,15 @@ compilers.setup require_fortran -clang -llvm -dragonegg
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-lapack.pc.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-BLAS-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-BLAS-blas.pc.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-BLAS-CMakeLists.txt.diff \
</span> patch-CBLAS-CMakeLists.txt.diff \
patch-CBLAS-cblas.pc.in.diff \
patch-CMakeLists.txt.diff \
patch-LAPACKE-CMakeLists.txt.diff \
patch-LAPACKE-lapacke.pc.in.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DADD_
</span> configure.args-delete \
-DCMAKE_INSTALL_RPATH=${prefix}/lib \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +50,12 @@ configure.args-append \
</span> -DCMAKE_INSTALL_RPATH=${prefix}/lib/${name} \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# overwrite empty headers generated by FortranCInterface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy -force ${worksrcpath}/CBLAS/include/cblas_mangling_with_flags.h ${worksrcpath}/CBLAS/include/cblas_mangling.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy -force ${worksrcpath}/LAPACKE/include/lapacke_mangling_with_flags.h ${worksrcpath}/LAPACKE/include/lapacke_mangling.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant accelerate description {use BLAS in Accelerate.framework} {
depends_lib-append port:vecLibFort
configure.args-append -DUSE_OPTIMIZED_BLAS=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/lapack/files/patch-CMakeLists.txt.diff b/math/lapack/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ed1272f..c04702f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/lapack/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/lapack/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2015-11-16 05:33:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2016-03-19 12:08:17.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2016-06-19 07:15:11.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2016-11-12 21:59:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,7 +136,7 @@
</span>
set(SECOND_SRC ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
set(DSECOND_SRC ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
# --------------------------------------------------
# Precision to build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,7 +302,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,7 +328,7 @@
</span> set(_lapack_config_install_guard_target "")
if(ALL_TARGETS)
install(EXPORT lapack-targets
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span>
# Choose one of the lapack targets to use as a guard for
# lapack-config.cmake to load targets from the install tree.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -333,7 +333,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -359,7 +359,7 @@
</span> ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</span> install(FILES
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
DESTINATION ${PKG_CONFIG_DIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -352,5 +352,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -378,5 +378,5 @@
</span> install(FILES
${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
${LAPACK_BINARY_DIR}/lapack-config-version.cmake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/lapack/files/patch-lapack.pc.in.diff b/math/lapack/files/patch-lapack.pc.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3d5cf71..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/lapack/files/patch-lapack.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lapack.pc.in.orig 2010-12-16 03:44:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lapack.pc.in 2016-03-19 12:20:17.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--prefix=@prefix@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libdir=@libdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+prefix=@CMAKE_INSTALL_PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+exec_prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libdir=${exec_prefix}/lib/lapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+includedir=${prefix}/include/lapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Name: lapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
</span></pre><pre style='margin:0'>
</pre>