Control dependencies

microsoft · Jan 15, 2025 · f2c4bbf · f2c4bbf
1 parent b57b287
commit f2c4bbf
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 14 deletions.
diff --git a/ports/octave/portfile.cmake b/ports/octave/portfile.cmake
@@ -29,22 +29,51 @@ vcpkg_find_acquire_program(GPERF)
 get_filename_component(GPERF_EXE_PATH "${GPERF}" DIRECTORY)
 vcpkg_add_to_path("${GPERF_EXE_PATH}")
 
+vcpkg_find_acquire_program(PKGCONFIG)
+set(ENV{PKGCONFIG} "${PKGCONFIG}")
+
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     AUTOCONFIG
     OPTIONS
     --disable-docs
-    --without-amd
-    --without-camd
-    --without-ccolamd
-    --without-cholmod
-    --without-colamd
-    --without-curl
-    --without-cxsparse
-    --without-hdf5
-    --without-qhull_r
-    --without-qrupdate
-    --without-umfpack
+    --disable-java
+    --disable-hg-id
+    --enable-lib-visibility-flags
+    --enable-relocate-all
+    --with-amd=no
+    --with-arpack=no
+    --with-bz2=no
+    --with-camd=no
+    --with-ccolamd=no
+    --with-cholmod=no
+    --with-colamd=no
+    --with-cxsparse=no
+    --with-curl=no
+    --with-cxsparse=no
+    --with-fftw3 # yes
+    --with-fftw3f # yes
+    --with-fltk=no
+    --with-fontconfig=no
+    --with-freetype=no
+    --with-glpk # yes
+    --with-hdf5=no
+    --with-klu=no
+    --with-magick=no
+    --with-opengl # yes
+    --with-portaudio=no
+    --with-pcre2 # yes
+    --with-qhull_r=no
+    --with-qrupdate=no
+    --with-qscintilla=no
+    --with-qt=no
+    --with-sndfile # yes
+    --with-spqr=no
+    --with-suitesparseconfig=no
+    --with-sundials_ida=no
+    --with-sundials_nvecserial=no
+    --with-umfpack=no
+    --with-z # yes
 )
 vcpkg_install_make()
 vcpkg_fixup_pkgconfig()

diff --git a/ports/octave/vcpkg.json b/ports/octave/vcpkg.json
@@ -14,9 +14,7 @@
     "libsndfile",
     "opengl",
     "pcre2",
-    "portaudio",
     "readline",
-    "sundials",
     "zlib"
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6562,7 +6562,7 @@
     },
     "octave": {
       "baseline": "9.3.0",
-      "port-version": 0
+      "port-version": 1
     },
     "octomap": {
       "baseline": "1.10.0",

diff --git a/versions/o-/octave.json b/versions/o-/octave.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c2e5943f09f28264953ef0ff1163261177451a74",
+      "version": "9.3.0",
+      "port-version": 1
+    },
     {
       "git-tree": "ccc6f3902109e65f792d122b77ccd880b25c3ff8",
       "version": "9.3.0",