Use vcpkg-make, fixup

microsoft · Jan 16, 2025 · 659f2f4 · 659f2f4
1 parent 3da2919
commit 659f2f4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/ports/octave/portfile.cmake b/ports/octave/portfile.cmake
@@ -30,11 +30,16 @@ get_filename_component(GPERF_EXE_PATH "${GPERF}" DIRECTORY)
 vcpkg_add_to_path("${GPERF_EXE_PATH}")
 
 vcpkg_find_acquire_program(PKGCONFIG)
-set(ENV{PKGCONFIG} "${PKGCONFIG}")
+set(ENV{PKG_CONFIG} "${PKGCONFIG}")
 
-vcpkg_configure_make(
+if(VCPKG_HOST_IS_OSX)
+    message("${PORT} currently requires the following programs from the system package manager:\n    gsed\n\nIt can be installed with brew gnu-sed")
+endif()
+
+vcpkg_make_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    AUTOCONFIG
+    AUTORECONF
+    LANGUAGES C CXX Fortran
     OPTIONS
     --disable-docs
     --disable-java
@@ -75,11 +80,11 @@ vcpkg_configure_make(
     --with-umfpack=no
     --with-z # yes
 )
-vcpkg_install_make()
+vcpkg_make_install()
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-foreach(subdir IN ITEMS libexec lib/octave/site lib/octave/${VERSION}/site share/octave/octave/${VERSION}/site share/octave/octave/site/api-v59/m)
+foreach(subdir IN ITEMS libexec lib/octave/site lib/octave/${VERSION}/site share/octave/octave/${VERSION}/site share/octave/octave/site/api-v59)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/${subdir}")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/${subdir}")
 endforeach()

diff --git a/ports/octave/vcpkg.json b/ports/octave/vcpkg.json
@@ -4,6 +4,7 @@
   "port-version": 1,
   "description": "High-level interpreted language, primarily intended for numerical computations.",
   "homepage": "https://octave.org/",
+  "documentation": "https://docs.octave.org/latest/",
   "license": "GPL-3.0-or-later",
   "supports": "!windows | mingw",
   "dependencies": [
@@ -15,6 +16,10 @@
     "opengl",
     "pcre2",
     "readline",
+    {
+      "name": "vcpkg-make",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/versions/o-/octave.json b/versions/o-/octave.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "c2e5943f09f28264953ef0ff1163261177451a74",
+      "git-tree": "a4fca879eb0d909e93be7d264235392b618f9e0a",
       "version": "9.3.0",
       "port-version": 1
     },