git: 9793edf4d3c0 - main - math/hpipm: Update 0.1.1 -> 0.1.3-119
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 10 Jun 2022 17:57:53 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9793edf4d3c0a7b81c357325ed5f7aea0c0533ec
commit 9793edf4d3c0a7b81c357325ed5f7aea0c0533ec
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-06-10 17:57:26 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-06-10 17:57:50 +0000
math/hpipm: Update 0.1.1 -> 0.1.3-119
---
math/hpipm/Makefile | 8 +++--
math/hpipm/distinfo | 6 ++--
math/hpipm/files/patch-CMakeLists.txt | 42 ++++++++++++++++++++++--
math/hpipm/pkg-plist | 61 +++++++++++++++++++++++++++++++++--
4 files changed, 106 insertions(+), 11 deletions(-)
diff --git a/math/hpipm/Makefile b/math/hpipm/Makefile
index 813bddf15822..a56470ba3e9c 100644
--- a/math/hpipm/Makefile
+++ b/math/hpipm/Makefile
@@ -1,5 +1,6 @@
PORTNAME= hpipm
-DISTVERSION= 0.1.1
+DISTVERSION= 0.1.3-119
+DISTVERSIONSUFFIX= -gb140f36
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
@@ -8,12 +9,15 @@ COMMENT= High-performance interior-point-method QP solvers
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= blasfeo>0:math/blasfeo
+LIB_DEPENDS= libblasfeo.so:math/blasfeo
USES= cmake localbase
USE_GITHUB= yes
GH_ACCOUNT= giaf
+CMAKE_ON= BUILD_SHARED_LIBS
+CMAKE_ARGS= -DHPIPM_BLASFEO_LIB=Shared
+
.include <bsd.port.pre.mk>
.if ${ARCH} != amd64 && ${ARCH} != i386
diff --git a/math/hpipm/distinfo b/math/hpipm/distinfo
index c7d68ae11693..1a63a2bcb352 100644
--- a/math/hpipm/distinfo
+++ b/math/hpipm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578132827
-SHA256 (giaf-hpipm-0.1.1_GH0.tar.gz) = 2e9142ade463159a098f523d1292eb1171dabbf6a2fddfd656d16d132c3eb595
-SIZE (giaf-hpipm-0.1.1_GH0.tar.gz) = 1454957
+TIMESTAMP = 1654881826
+SHA256 (giaf-hpipm-0.1.3-119-gb140f36_GH0.tar.gz) = 3d949267f14738ff78298ac97b1a30d8e3edd98c765446e306dc9669afd432ed
+SIZE (giaf-hpipm-0.1.3-119-gb140f36_GH0.tar.gz) = 1707299
diff --git a/math/hpipm/files/patch-CMakeLists.txt b/math/hpipm/files/patch-CMakeLists.txt
index f79705b6577a..5223658667cb 100644
--- a/math/hpipm/files/patch-CMakeLists.txt
+++ b/math/hpipm/files/patch-CMakeLists.txt
@@ -1,11 +1,47 @@
---- CMakeLists.txt.orig 2019-08-24 23:47:04 UTC
+--- CMakeLists.txt.orig 2022-06-01 15:00:13 UTC
+++ CMakeLists.txt
-@@ -228,7 +228,7 @@ install(TARGETS hpipm EXPORT hpipmConfig
+@@ -36,7 +36,7 @@
+ cmake_minimum_required(VERSION 2.8.11)
+
+ # installation directory ( has to be before `project()` )
+-set(CMAKE_INSTALL_PREFIX "/opt/hpipm" CACHE STRING "Installation path")
++#set(CMAKE_INSTALL_PREFIX "/opt/hpipm" CACHE STRING "Installation path")
+
+ project(hpipm C)
+
+@@ -92,7 +92,7 @@ endif()
+
+ # BLASFEO Option
+ if(NOT TARGET blasfeo)
+- set(BLASFEO_PATH "/opt/blasfeo" CACHE STRING "BLASFEO installation path")
++ set(BLASFEO_PATH ${CMAKE_INSTALL_PREFIX} CACHE STRING "BLASFEO installation path")
+ if(BUILD_SHARED_LIBS MATCHES OFF)
+ set(HPIPM_BLASFEO_LIB "Static" CACHE STRING "BLASFEO library link type")
+ else()
+@@ -151,7 +151,7 @@ if(${REF_BLAS} MATCHES 0)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
+ endif(${REF_BLAS} MATCHES 0)
+ if(${REF_BLAS} MATCHES OPENBLAS)
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_OPENBLAS -I/opt/openblas/include")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_OPENBLAS")
+ endif(${REF_BLAS} MATCHES OPENBLAS)
+ if(${REF_BLAS} MATCHES BLIS)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_BLIS -std=c99")
+@@ -160,7 +160,7 @@ if(${REF_BLAS} MATCHES NETLIB)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_NETLIB")
+ 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")
+ endif(${REF_BLAS} MATCHES MKL)
+ if(${REF_BLAS} MATCHES ATLAS)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_ATLAS")
+@@ -343,7 +343,7 @@ install(TARGETS hpipm EXPORT hpipmConfig
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin)
-install(EXPORT hpipmConfig DESTINATION cmake)
-+install(EXPORT hpipmConfig DESTINATION lib/cmake/hpipm)
++install(EXPORT hpipmConfig DESTINATION lib/cmake)
file(GLOB_RECURSE HPIPM_HEADERS "include/*.h")
install(FILES ${HPIPM_HEADERS} DESTINATION ${HPIPM_HEADERS_INSTALLATION_DIRECTORY})
diff --git a/math/hpipm/pkg-plist b/math/hpipm/pkg-plist
index f35bc2bbd4e3..73e83b104c9b 100644
--- a/math/hpipm/pkg-plist
+++ b/math/hpipm/pkg-plist
@@ -1,61 +1,116 @@
+include/hpipm_aux_mem.h
include/hpipm_aux_string.h
include/hpipm_common.h
+include/hpipm_d_cast_qcqp.h
include/hpipm_d_cond.h
include/hpipm_d_cond_aux.h
+include/hpipm_d_cond_qcqp.h
include/hpipm_d_core_qp_ipm.h
include/hpipm_d_core_qp_ipm_aux.h
+include/hpipm_d_dense_qcqp.h
+include/hpipm_d_dense_qcqp_dim.h
+include/hpipm_d_dense_qcqp_ipm.h
+include/hpipm_d_dense_qcqp_res.h
+include/hpipm_d_dense_qcqp_sol.h
+include/hpipm_d_dense_qcqp_utils.h
include/hpipm_d_dense_qp.h
include/hpipm_d_dense_qp_dim.h
include/hpipm_d_dense_qp_ipm.h
include/hpipm_d_dense_qp_kkt.h
include/hpipm_d_dense_qp_res.h
include/hpipm_d_dense_qp_sol.h
+include/hpipm_d_dense_qp_utils.h
+include/hpipm_d_ocp_qcqp.h
+include/hpipm_d_ocp_qcqp_dim.h
+include/hpipm_d_ocp_qcqp_ipm.h
+include/hpipm_d_ocp_qcqp_red.h
+include/hpipm_d_ocp_qcqp_res.h
+include/hpipm_d_ocp_qcqp_sol.h
+include/hpipm_d_ocp_qcqp_utils.h
include/hpipm_d_ocp_qp.h
include/hpipm_d_ocp_qp_dim.h
include/hpipm_d_ocp_qp_ipm.h
include/hpipm_d_ocp_qp_kkt.h
+include/hpipm_d_ocp_qp_red.h
include/hpipm_d_ocp_qp_res.h
include/hpipm_d_ocp_qp_sol.h
include/hpipm_d_ocp_qp_utils.h
include/hpipm_d_part_cond.h
+include/hpipm_d_part_cond_qcqp.h
+include/hpipm_d_sim_erk.h
+include/hpipm_d_sim_rk.h
+include/hpipm_d_tree_ocp_qcqp.h
+include/hpipm_d_tree_ocp_qcqp_dim.h
+include/hpipm_d_tree_ocp_qcqp_ipm.h
+include/hpipm_d_tree_ocp_qcqp_res.h
+include/hpipm_d_tree_ocp_qcqp_sol.h
+include/hpipm_d_tree_ocp_qcqp_utils.h
include/hpipm_d_tree_ocp_qp.h
include/hpipm_d_tree_ocp_qp_dim.h
include/hpipm_d_tree_ocp_qp_ipm.h
include/hpipm_d_tree_ocp_qp_kkt.h
include/hpipm_d_tree_ocp_qp_res.h
include/hpipm_d_tree_ocp_qp_sol.h
+include/hpipm_d_tree_ocp_qp_utils.h
include/hpipm_m_dense_qp.h
include/hpipm_m_dense_qp_dim.h
include/hpipm_m_ocp_qp.h
include/hpipm_m_ocp_qp_ipm_hard.h
include/hpipm_m_ocp_qp_kkt.h
+include/hpipm_s_cast_qcqp.h
include/hpipm_s_cond.h
include/hpipm_s_cond_aux.h
+include/hpipm_s_cond_qcqp.h
include/hpipm_s_core_qp_ipm.h
include/hpipm_s_core_qp_ipm_aux.h
+include/hpipm_s_dense_qcqp.h
+include/hpipm_s_dense_qcqp_dim.h
+include/hpipm_s_dense_qcqp_ipm.h
+include/hpipm_s_dense_qcqp_res.h
+include/hpipm_s_dense_qcqp_sol.h
+include/hpipm_s_dense_qcqp_utils.h
include/hpipm_s_dense_qp.h
include/hpipm_s_dense_qp_dim.h
include/hpipm_s_dense_qp_ipm.h
include/hpipm_s_dense_qp_kkt.h
include/hpipm_s_dense_qp_res.h
include/hpipm_s_dense_qp_sol.h
+include/hpipm_s_dense_qp_utils.h
+include/hpipm_s_ocp_qcqp.h
+include/hpipm_s_ocp_qcqp_dim.h
+include/hpipm_s_ocp_qcqp_ipm.h
+include/hpipm_s_ocp_qcqp_red.h
+include/hpipm_s_ocp_qcqp_res.h
+include/hpipm_s_ocp_qcqp_sol.h
+include/hpipm_s_ocp_qcqp_utils.h
include/hpipm_s_ocp_qp.h
include/hpipm_s_ocp_qp_dim.h
include/hpipm_s_ocp_qp_ipm.h
include/hpipm_s_ocp_qp_kkt.h
+include/hpipm_s_ocp_qp_red.h
include/hpipm_s_ocp_qp_res.h
include/hpipm_s_ocp_qp_sol.h
include/hpipm_s_ocp_qp_utils.h
include/hpipm_s_part_cond.h
+include/hpipm_s_part_cond_qcqp.h
+include/hpipm_s_sim_erk.h
+include/hpipm_s_sim_rk.h
+include/hpipm_s_tree_ocp_qcqp.h
+include/hpipm_s_tree_ocp_qcqp_dim.h
+include/hpipm_s_tree_ocp_qcqp_ipm.h
+include/hpipm_s_tree_ocp_qcqp_res.h
+include/hpipm_s_tree_ocp_qcqp_sol.h
+include/hpipm_s_tree_ocp_qcqp_utils.h
include/hpipm_s_tree_ocp_qp.h
include/hpipm_s_tree_ocp_qp_dim.h
include/hpipm_s_tree_ocp_qp_ipm.h
include/hpipm_s_tree_ocp_qp_kkt.h
include/hpipm_s_tree_ocp_qp_res.h
include/hpipm_s_tree_ocp_qp_sol.h
+include/hpipm_s_tree_ocp_qp_utils.h
include/hpipm_scenario_tree.h
include/hpipm_timing.h
include/hpipm_tree.h
-lib/cmake/hpipm/hpipmConfig-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/hpipm/hpipmConfig.cmake
-lib/libhpipm.a
+lib/cmake/hpipmConfig-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/hpipmConfig.cmake
+lib/libhpipm.so