svn commit: r522823 - branches/2020Q1/math/clp/files

[Piotr Kubaj]

Author: pkubaj
Date: Sun Jan 12 17:28:02 2020
New Revision: 522823
URL: https://svnweb.freebsd.org/changeset/ports/522823

Log:
  MFH: r522821
  
  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 at gmail.com (maintainer timeout)
  Approved by:	portmgr (fix build blanket)

Added:
  branches/2020Q1/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp
     - copied unchanged from r522821, head/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp
  branches/2020Q1/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp
     - copied unchanged from r522821, head/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp
Modified:
Directory Properties:
  branches/2020Q1/   (props changed)

Copied: branches/2020Q1/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp (from r522821, head/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q1/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp	Sun Jan 12 17:28:02 2020	(r522823, copy of r522821, head/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. */

Copied: branches/2020Q1/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp (from r522821, head/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q1/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp	Sun Jan 12 17:28:02 2020	(r522823, copy of r522821, head/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,