diff options
author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-01-12 17:26:24 +0000 |
---|---|---|
committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-01-12 17:26:24 +0000 |
commit | 2c8bc2c7f02101ceb5bb59371d14e31502b02323 (patch) | |
tree | d69307ea8804f14448ca6261c5a87ffd3cdbb7b6 | |
parent | - Update greybird-theme to 3.22.11 (diff) |
math/clp: fix build on non-x86 non-ARM
Only amd64 and i386 have immintrin.h. There's a check for ARM, but not for other architectures.
Building without immintrin.h works fine on amd64.
PR: 242966
Approved by: co9co9@gmail.com (maintainer timeout)
MFH: 2020Q1 (fix build blanket)
Notes
Notes:
svn path=/head/; revision=522821
-rw-r--r-- | math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp | 11 | ||||
-rw-r--r-- | math/clp/files/patch-Clp_src_ClpSimplexDual.cpp | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp b/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp new file mode 100644 index 000000000000..c232f2be67a2 --- /dev/null +++ b/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp @@ -0,0 +1,11 @@ +--- Clp/src/ClpPackedMatrix.cpp.orig 2019-12-29 17:14:00 UTC ++++ Clp/src/ClpPackedMatrix.cpp +@@ -6752,7 +6752,7 @@ ClpPackedMatrix3::ClpPackedMatrix3() + #elif defined(__arm__) + #include <arm_neon.h> + #else +-#include <immintrin.h> ++//#include <immintrin.h> + //#include <fmaintrin.h> + #endif + /* Constructor from copy. */ diff --git a/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp b/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp new file mode 100644 index 000000000000..5f88f8b7db6d --- /dev/null +++ b/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp @@ -0,0 +1,11 @@ +--- Clp/src/ClpSimplexDual.cpp.orig 2019-12-29 17:45:58 UTC ++++ Clp/src/ClpSimplexDual.cpp +@@ -3559,7 +3559,7 @@ void moveAndZero(clpTempInfo *info, int type, void *ex + #elif defined(__arm__) + #include <arm_neon.h> + #else +-#include <immintrin.h> ++//#include <immintrin.h> + //#include <fmaintrin.h> + #endif + int ClpSimplexDual::dualColumn0(const CoinIndexedVector *rowArray, |