<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4294b813d530e3531f6025c6e562dfd62b217b53">https://github.com/macports/macports-ports/commit/4294b813d530e3531f6025c6e562dfd62b217b53</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 4294b813d53 AlphaSparse: fix build on Sonoma, install headers
</span>4294b813d53 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4294b813d530e3531f6025c6e562dfd62b217b53
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Feb 20 07:41:25 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> AlphaSparse: fix build on Sonoma, install headers
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/68912
</span>---
math/AlphaSparse/Portfile | 23 ++++---
.../AlphaSparse/files/0011-Fix-some-includes.patch | 76 ++++++++++++++++++++++
...r-Rosetta.patch => 0012-Hack-for-Rosetta.patch} | 0
...0012-patch-clang.diff => 0013-patch-clang.diff} | 11 ++++
4 files changed, 102 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/AlphaSparse/Portfile b/math/AlphaSparse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f09b1e8f3d7..4e7e83f1236 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/AlphaSparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/AlphaSparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup mpi 1.0
</span>
github.setup AlphaSparse AlphaSparse 57eefee000734f40d9e972cbd110fbc4c51a71d3
version 2023.06.19
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math
license BSD
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,8 @@ patchfiles-append 0001-Support-PPC-in-Makefile.patch \
</span> 0007-src-Makefile-there-is-no-tuning-dir.patch \
0008-Makefile-fix-dylib-target-for-macOS.patch \
0009-Fixes-for-Macports.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0010-Makefile.tail-split-lib-target-to-fix-ar-error.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0010-Makefile.tail-split-lib-target-to-fix-ar-error.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0011-Fix-some-includes.patch
</span>
post-extract {
# These dirs are needed but not created automatically:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,10 +92,13 @@ compiler.cxx_standard 2011
</span>
# Xcode clang does not support OpenMP:
# error: unsupported option '-fopenmp': unsupported option '-fopenmp'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# mpich-clang16 does not build it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# mpich-clang15 and mpich-gcc13 work fine.
</span> compiler.blacklist-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {clang} {macports-clang-1[6-9]}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.arch} eq "powerpc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {(${os.platform} eq "darwin" && ${os.arch} eq "powerpc") ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.cxx_stdlib} ne "libc++"} {
</span> mpi.setup require require_fortran \
-gcc44 -gcc45 -gcc46 -gcc47 -gcc48 -gcc49 -gcc5 -gcc6 -gcc7 -gcc8 \
-clang -fortran
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,15 +126,18 @@ if {${build_arch} eq "arm64"} {
</span> # Rosetta-specific fix:
platform darwin 10 powerpc {
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0011-Hack-for-Rosetta.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0012-Hack-for-Rosetta.patch
</span> }
if {[string match *clang* ${configure.compiler}]} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0012-patch-clang.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0013-patch-clang.diff
</span> }
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/lib/libalpha_spblas.a ${destroot}/${prefix}/lib/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# copy ${worksrcpath}/lib/libalpha_spblas.dylib ${destroot}/${prefix}/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/include/alphasparse.h ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/include/alpha_spblas_dcu.h ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/include/alphasparse ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/lib/libalpha_spblas.a ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# copy ${worksrcpath}/lib/libalpha_spblas.dylib ${destroot}${prefix}/lib
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/AlphaSparse/files/0011-Fix-some-includes.patch b/math/AlphaSparse/files/0011-Fix-some-includes.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..77f99abe148
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/AlphaSparse/files/0011-Fix-some-includes.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,76 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a703379fea71cf00a356d814b6d22da410c8895b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 20 Feb 2024 04:16:17 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] Fix some includes
</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;'>+ src/core/op_/alphasparse_convert_csr5.c | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/core/op_/alphasparse_convert_ell.c | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/core/op_/alphasparse_convert_gebsr.c | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/core/op_/alphasparse_convert_hyb.c | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/core/op_/alphasparse_convert_sky.c | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 8 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/core/op_/alphasparse_convert_csr5.c b/src/core/op_/alphasparse_convert_csr5.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0023803..2355167 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/core/op_/alphasparse_convert_csr5.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/core/op_/alphasparse_convert_csr5.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "alphasparse.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/format.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/spmat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/util/check.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "alphasparse/util/malloc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/core/op_/alphasparse_convert_ell.c b/src/core/op_/alphasparse_convert_ell.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 59343d0..bbc2720 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/core/op_/alphasparse_convert_ell.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/core/op_/alphasparse_convert_ell.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,6 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/spmat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/util/check.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/util/malloc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alphasparse_status_t convert_ell_datatype_coo(const alpha_internal_spmat *source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alpha_internal_spmat **dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alphasparse_datatype_t datatype) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/core/op_/alphasparse_convert_gebsr.c b/src/core/op_/alphasparse_convert_gebsr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 08a8d87..af5d990 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/core/op_/alphasparse_convert_gebsr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/core/op_/alphasparse_convert_gebsr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "alphasparse.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/format.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/spmat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/util/check.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "alphasparse/util/malloc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alphasparse_status_t convert_gebsr_datatype_coo(const alpha_internal_spmat *source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alpha_internal_spmat **dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/core/op_/alphasparse_convert_hyb.c b/src/core/op_/alphasparse_convert_hyb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e8c16e9..38360c6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/core/op_/alphasparse_convert_hyb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/core/op_/alphasparse_convert_hyb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "alphasparse.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/format.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/spmat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/util/check.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "alphasparse/util/malloc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alphasparse_status_t convert_hyb_datatype_coo(const alpha_internal_spmat *source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alpha_internal_spmat **dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/core/op_/alphasparse_convert_sky.c b/src/core/op_/alphasparse_convert_sky.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f181202..6fbbde2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/core/op_/alphasparse_convert_sky.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/core/op_/alphasparse_convert_sky.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/spmat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/util/check.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "alphasparse/util/malloc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alphasparse_status_t convert_sky_datatype_coo(const alpha_internal_spmat *source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alpha_internal_spmat **dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const alphasparse_fill_mode_t fill,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/AlphaSparse/files/0011-Hack-for-Rosetta.patch b/math/AlphaSparse/files/0012-Hack-for-Rosetta.patch
</span>similarity index 100%
rename from math/AlphaSparse/files/0011-Hack-for-Rosetta.patch
rename to math/AlphaSparse/files/0012-Hack-for-Rosetta.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/AlphaSparse/files/0012-patch-clang.diff b/math/AlphaSparse/files/0013-patch-clang.diff
</span>similarity index 63%
rename from math/AlphaSparse/files/0012-patch-clang.diff
rename to math/AlphaSparse/files/0013-patch-clang.diff
<span style='display:block; white-space:pre;color:#808080;'>index f959ceb0394..5c24b249e80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/AlphaSparse/files/0012-patch-clang.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/AlphaSparse/files/0013-patch-clang.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,3 +8,14 @@
</span> CFLAGS += -fstack-protector-all
CFLAGS += -fPIC
# CFLAGS += -Wl,-z,relro -Wl,-z,noexecstack -Wl,-z,now
<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;'>+--- a/src/kernel/arm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/kernel/arm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += -ftree-vectorize -ftree-vectorizer-verbose=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -ftree-vectorize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SRC_DIR = $(shell find . -type d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>