Date: Tue, 5 Jul 2022 07:36:22 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 76c7602fdb82 - main - math/hpipm: Fix build on i386 Message-ID: <202207050736.2657aMx4060491@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=76c7602fdb8216f6b10c957add54671111c27af0 commit 76c7602fdb8216f6b10c957add54671111c27af0 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-07-05 07:35:31 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2022-07-05 07:36:20 +0000 math/hpipm: Fix build on i386 ... by removing hardcoded -m64. Reported by: fallout --- math/hpipm/files/patch-CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/math/hpipm/files/patch-CMakeLists.txt b/math/hpipm/files/patch-CMakeLists.txt index 5223658667cb..3f86ec49de06 100644 --- a/math/hpipm/files/patch-CMakeLists.txt +++ b/math/hpipm/files/patch-CMakeLists.txt @@ -18,6 +18,15 @@ if(BUILD_SHARED_LIBS MATCHES OFF) set(HPIPM_BLASFEO_LIB "Static" CACHE STRING "BLASFEO library link type") else() +@@ -140,7 +140,7 @@ endif() + if(${TARGET} MATCHES AVX) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTARGET_AVX") + if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -mavx") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx") + endif() + elseif(${TARGET} MATCHES GENERIC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTARGET_GENERIC") @@ -151,7 +151,7 @@ if(${REF_BLAS} MATCHES 0) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ") endif(${REF_BLAS} MATCHES 0) @@ -32,7 +41,7 @@ endif(${REF_BLAS} MATCHES NETLIB) if(${REF_BLAS} MATCHES MKL) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_MKL -m64 -I/opt/intel/mkl/include") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_MKL -m64") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_MKL") endif(${REF_BLAS} MATCHES MKL) if(${REF_BLAS} MATCHES ATLAS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_ATLAS")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207050736.2657aMx4060491>