From 663fd9f887ca249670b0419963ce197cfa7f0031 Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 29 Aug 2024 09:36:48 +0300 Subject: [PATCH] [octave] Without suitesparse, curl and qhall. With more libs (#40667) --- ports/octave/portfile.cmake | 10 ++++++++++ ports/octave/vcpkg.json | 10 +++++----- versions/baseline.json | 2 +- versions/o-/octave.json | 5 +++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ports/octave/portfile.cmake b/ports/octave/portfile.cmake index 9dfcbbd280..3e6422cd01 100644 --- a/ports/octave/portfile.cmake +++ b/ports/octave/portfile.cmake @@ -35,7 +35,17 @@ vcpkg_configure_make( AUTOCONFIG OPTIONS --disable-docs + --without-amd + --without-camd + --without-ccolamd + --without-cholmod + --without-colamd + --without-curl + --without-cxsparse --without-hdf5 + --without-qhull + --without-qrupdate + --without-umfpack ) vcpkg_install_make() diff --git a/ports/octave/vcpkg.json b/ports/octave/vcpkg.json index 6d1a4fae44..fb609d2600 100644 --- a/ports/octave/vcpkg.json +++ b/ports/octave/vcpkg.json @@ -1,22 +1,22 @@ { "name": "octave", "version": "9.2.0", + "port-version": 1, "description": "High-level interpreted language, primarily intended for numerical computations.", "homepage": "https://octave.org/", "license": "GPL-3.0-or-later", "supports": "!arm", "dependencies": [ "blas", - { - "name": "curl", - "default-features": false - }, "fftw3", + "glpk", "lapack", + "libsndfile", "opengl", "pcre2", - "qhull", + "portaudio", "readline", + "sundials", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index f084a31ff4..756ee1a50b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6426,7 +6426,7 @@ }, "octave": { "baseline": "9.2.0", - "port-version": 0 + "port-version": 1 }, "octomap": { "baseline": "1.10.0", diff --git a/versions/o-/octave.json b/versions/o-/octave.json index e71a4a7429..e8f9f3ca03 100644 --- a/versions/o-/octave.json +++ b/versions/o-/octave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50aea0f8c6c48fa888e1b8ef0bdd611ca14a375d", + "version": "9.2.0", + "port-version": 1 + }, { "git-tree": "6bb24fb39b584c5298f49de82807d011368c9eeb", "version": "9.2.0",