<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/667ad3360c7a81a687e8684987919f89914f27fa">https://github.com/macports/macports-ports/commit/667ad3360c7a81a687e8684987919f89914f27fa</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 667ad3360c7 octave-piqp: fix the build
</span>667ad3360c7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 667ad3360c7a81a687e8684987919f89914f27fa
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sun Jun 23 07:49:57 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> octave-piqp: fix the build
</span>---
octave/octave-piqp/Portfile | 17 +++++-
octave/octave-piqp/files/patch-fix-build.diff | 64 ++++++++++++++++++++++
octave/octave-piqp/files/patch-unbreak-eigen3.diff | 20 +++++++
3 files changed, 100 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/octave/octave-piqp/Portfile b/octave/octave-piqp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b3ce99a2d87..bbe313dd22f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/octave/octave-piqp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/octave/octave-piqp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup github PREDICT-EPFL piqp 0.4.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license BSD
maintainers {mps @Schamschula} openmaintainer
description PIQP is a Proximal Interior Point Quadratic Programming solver.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,3 +19,18 @@ use_tar yes
</span> checksums rmd160 1e6d616c857874b7b4f0ccb93458422f5158c751 \
sha256 ce8e5d3f9a51341062658eb1d48eb4838e3117fa45584d4325466e4b3997d3a4 \
size 17940480
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove -march=native, we do not want this for distribution.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also notice, that on PowerPC it is unsupported and -mtune=native is to be used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This should be dropped once bundled Eigen is updated past 3.4.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The bug is fixed in upstream.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-unbreak-eigen3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/make_piqp.m ${worksrcpath}/src/piqp/interfaces/octave/make_piqp.m
</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;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2014
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/octave/octave-piqp/files/patch-fix-build.diff b/octave/octave-piqp/files/patch-fix-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5c2c65a2622
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/octave/octave-piqp/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- make_piqp.m 2024-06-22 17:47:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ make_piqp.m 2024-06-23 07:37:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,14 +48,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eigen_include_dir = fullfile(piqp_octave_dir, 'src/eigen');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ piqp_dir = fullfile(piqp_octave_dir, '../..');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eigen_include_dir = '/usr/local/include/eigen3';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eigen_include_dir = '@PREFIX@/include/eigen3';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %% piqp_oct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if any(strcmpi(what,'oct')) || any(strcmpi(what,'all'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf('Compiling PIQP Octave interface...\n');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkoctfile('-O3', '-DNDEBUG', '-march=native', '-std=gnu++14', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkoctfile('-O3', '-DNDEBUG', '-std=gnu++14', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['-I', fullfile(piqp_dir, 'include')], ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['-I', eigen_include_dir], ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-o', 'piqp_oct.oct', fullfile(piqp_dir, 'interfaces/octave/piqp_oct.cpp'));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/piqp/interfaces/octave/make_piqp.m 2024-06-22 17:47:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/piqp/interfaces/octave/make_piqp.m 2024-06-23 07:36:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,14 +48,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eigen_include_dir = fullfile(piqp_octave_dir, 'src/eigen');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ piqp_dir = fullfile(piqp_octave_dir, '../..');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eigen_include_dir = '/usr/local/include/eigen3';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eigen_include_dir = '@PREFIX@/include/eigen3';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %% piqp_oct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if any(strcmpi(what,'oct')) || any(strcmpi(what,'all'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf('Compiling PIQP Octave interface...\n');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkoctfile('-O3', '-DNDEBUG', '-march=native', '-std=gnu++14', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkoctfile('-O3', '-DNDEBUG', '-std=gnu++14', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['-I', fullfile(piqp_dir, 'include')], ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['-I', eigen_include_dir], ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-o', 'piqp_oct.oct', fullfile(piqp_dir, 'interfaces/octave/piqp_oct.cpp'));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/eigen/bench/perf_monitoring/run.sh 2021-08-19 04:41:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/eigen/bench/perf_monitoring/run.sh 2024-06-23 07:36:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,8 +120,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # echo $update et $selected et $rev_found because $rev et "$global_args"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # echo $count_rev et $count_ref
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if $update || [ $count_rev != $count_ref ] || ( $selected && $rev_found ); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "RUN: $CXX -O3 -DNDEBUG -march=native $CXX_FLAGS -I eigen_src $bench.cpp -DSCALAR=$scalar -o $name"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if $CXX -O3 -DNDEBUG -march=native $CXX_FLAGS -I eigen_src $bench.cpp -DSCALAR=$scalar -o $name; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "RUN: $CXX -O3 -DNDEBUG $CXX_FLAGS -I eigen_src $bench.cpp -DSCALAR=$scalar -o $name"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if $CXX -O3 -DNDEBUG $CXX_FLAGS -I eigen_src $bench.cpp -DSCALAR=$scalar -o $name; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curr=`./$name $settings_file`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ $count_rev == $count_ref ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "merge previous $prev"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/eigen/bench/tensors/eigen_sycl_bench.sh 2021-08-19 04:41:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/eigen/bench/tensors/eigen_sycl_bench.sh 2024-06-23 07:36:38.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I ../../ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I ${COMPUTECPP_PACKAGE_ROOT_DIR}/include/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--march=native \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -O3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DNDEBUG \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEIGEN_MPL2_ONLY \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/octave/octave-piqp/files/patch-unbreak-eigen3.diff b/octave/octave-piqp/files/patch-unbreak-eigen3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..315826f44eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/octave/octave-piqp/files/patch-unbreak-eigen3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/eigen/Eigen/Core 2021-08-19 04:41:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/eigen/Eigen/Core 2024-06-23 07:46:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,7 +206,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/arch/SSE/TypeCasting.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/arch/SSE/MathFunctions.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/arch/SSE/Complex.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif (defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX)) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/arch/AltiVec/PacketMath.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/arch/AltiVec/MathFunctions.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/arch/AltiVec/Complex.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -346,7 +346,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/CoreIterators.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/ConditionEstimator.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX)) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/arch/AltiVec/MatrixProduct.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined EIGEN_VECTORIZE_NEON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "src/Core/arch/NEON/GeneralBlockPanelKernel.h"
</span></pre><pre style='margin:0'>
</pre>