<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/74409d21999f882a2a03d8109a0a633dfa092ba8">https://github.com/macports/macports-ports/commit/74409d21999f882a2a03d8109a0a633dfa092ba8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 74409d21999f882a2a03d8109a0a633dfa092ba8
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Fri Dec 22 21:59:41 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> adept2: use linear_algebra
</span>---
math/adept2/Portfile | 25 +++++++++++++++----------
math/adept2/files/patch-include.diff | 29 -----------------------------
2 files changed, 15 insertions(+), 39 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/adept2/Portfile b/math/adept2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b30c063634..e1c140b5601 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/adept2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/adept2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,12 @@
</span> PortSystem 1.0
PortGroup compilers 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup linear_algebra 1.0
</span>
github.setup rjhogan Adept-2 74492d7fbc9fca1ab62705c86d53f2e298cdb096
name adept2
version 2023.10.03
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories math
license Apache-2
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,26 +20,30 @@ checksums rmd160 1a43dfac902646c7a51a727d8d34a5caf59158a4 \
</span> size 328130
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set_default_variants no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset blis] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![variant_isset flexiblas] && ![variant_isset openblas]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +openblas
</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;'>+use_autoreconf yes
</span>
compilers.choose fc f90 f77
compilers.setup require_fortran
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/rjhogan/Adept-2/issues/24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-include.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|include <cblas.h>|include <cblas_openblas.h>|" ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|cblas.h|cblas_openblas.h|" ${worksrcpath}/adept/settings.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [variant_isset openblas] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|include <cblas.h>|include <cblas_openblas.h>|" ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|cblas.h|cblas_openblas.h|" ${worksrcpath}/adept/settings.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
pre-configure {
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-blas="-L${prefix}/lib -lopenblas"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-blas="-L${prefix}/lib ${linalglib}"
</span> }
depends_test-append port:gsl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/adept2/files/patch-include.diff b/math/adept2/files/patch-include.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b9cd5c4bc90..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/adept2/files/patch-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/create_adept_source_header.orig 2022-12-18 04:01:21.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/create_adept_source_header 2023-01-13 05:25:29.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,23 +48,16 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* Feel free to delete this warning: */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _MSC_FULL_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma message(\"warning: the adept_source.h header file has not been edited so BLAS matrix multiplication and LAPACK linear-algebra support have been disabled\")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#warning \"The adept_source.h header file has not been edited so BLAS matrix multiplication and LAPACK linear-algebra support have been disabled\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Uncomment this if you are linking to the BLAS library (header file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- not required) to enable matrix multiplication */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--//#define HAVE_BLAS 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_BLAS 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Uncomment this if you are linking to the LAPACK library (header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file not required) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--//#define HAVE_LAPACK 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_LAPACK 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Uncomment this if you have the cblas.h header from OpenBLAS */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--//#define HAVE_OPENBLAS_CBLAS_HEADER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_OPENBLAS_CBLAS_HEADER
</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;'>-
</span></pre><pre style='margin:0'>
</pre>