From efd569a0761b45b18e6a861413298a31c0fac0f3 Mon Sep 17 00:00:00 2001 From: Vincent Le Garrec Date: Sat, 7 Feb 2026 19:01:56 +0100 Subject: [PATCH 1/2] [metis] USE_GKREGEX is passed by gklib's CMake --- ports/metis/build-fixes-gkregex.patch | 14 ++++++++++++++ ports/metis/portfile.cmake | 1 + ports/metis/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/metis.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/metis/build-fixes-gkregex.patch diff --git a/ports/metis/build-fixes-gkregex.patch b/ports/metis/build-fixes-gkregex.patch new file mode 100644 index 00000000000000..2aa2f642b6df3c --- /dev/null +++ b/ports/metis/build-fixes-gkregex.patch @@ -0,0 +1,14 @@ +--- 3b0b581ab2-3f513bfb0c.clean/conf/gkbuild.cmake.old 2026-02-07 18:50:18.944623000 +0100 ++++ 3b0b581ab2-3f513bfb0c.clean/conf/gkbuild.cmake 2026-02-07 18:51:19.086997000 +0100 +@@ -16,9 +16,9 @@ option(GKRAND "enable GKRAND support" OF + + # Add compiler flags. + if(MSVC) +- set(GK_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE -DUSE_GKREGEX") ++ set(GK_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE") + elseif(MINGW) +- set(GK_COPTS "-DUSE_GKREGEX") ++# set(GK_COPTS "-DUSE_GKREGEX") + else() + set(GK_COPTIONS "-DLINUX -D_FILE_OFFSET_BITS=64") + endif(MSVC) diff --git a/ports/metis/portfile.cmake b/ports/metis/portfile.cmake index c96610d741c323..6d4150f109c251 100644 --- a/ports/metis/portfile.cmake +++ b/ports/metis/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH SHA512 c41168788c287ed9baea3c43c1ea8ef7d0bbdaa340a03cbbb5d0ba2d928d8a6dd83e2b77e7d3fabc58ac6d2b59a4be0492940e31460fe5e1807849cb98e80d2e PATCHES build-fixes.patch + build-fixes-gkregex.patch ) file(COPY "${SOURCE_PATH}/include/" DESTINATION "${SOURCE_PATH}/build/xinclude") file(COPY "${CMAKE_CURRENT_LIST_DIR}/install_config.cmake" DESTINATION "${SOURCE_PATH}") diff --git a/ports/metis/vcpkg.json b/ports/metis/vcpkg.json index 517882543a7ea1..c90c0313eef4e4 100644 --- a/ports/metis/vcpkg.json +++ b/ports/metis/vcpkg.json @@ -1,6 +1,7 @@ { "name": "metis", "version-date": "2025-07-04", + "port-version": 1, "description": "Serial Graph Partitioning and Fill-reducing Matrix Ordering", "homepage": "https://github.com/KarypisLab/METIS", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 359f6d7202a2ab..90130d7a1fd5e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6326,7 +6326,7 @@ }, "metis": { "baseline": "2025-07-04", - "port-version": 0 + "port-version": 1 }, "metrohash": { "baseline": "1.1.3", diff --git a/versions/m-/metis.json b/versions/m-/metis.json index e44379c7229ebb..ddef10823b12c5 100644 --- a/versions/m-/metis.json +++ b/versions/m-/metis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b831f3b20149877e84f9101cc44ebb1ffe0e26f9", + "version-date": "2025-07-04", + "port-version": 1 + }, { "git-tree": "83d3f4ee2d498f9bc5d8f63b562744442c6065f1", "version-date": "2025-07-04", From bd45af647e2ca27a6ac186fb04ce407fef857846 Mon Sep 17 00:00:00 2001 From: Vincent Le Garrec Date: Sat, 7 Feb 2026 19:50:28 +0100 Subject: [PATCH 2/2] [gklib] Add regex for mingw I don't really know when regex library is needed. So I add it only for MinGW --- ports/gklib/portfile.cmake | 1 + ports/gklib/regex.patch | 13 +++++++++++++ ports/gklib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gklib.json | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/gklib/regex.patch diff --git a/ports/gklib/portfile.cmake b/ports/gklib/portfile.cmake index 7e1779758df2ce..aa7f015f623fb4 100644 --- a/ports/gklib/portfile.cmake +++ b/ports/gklib/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( SHA512 54ba87f2c47e025ada0fe6fe608d9d144df5cd13e97e71892dbba4d50cd96409add309937a540cdf8bd2632cbfbc0e22e080a32d114ba6037008c8676aa8d88d PATCHES build-fixes.patch + regex.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED) diff --git a/ports/gklib/regex.patch b/ports/gklib/regex.patch new file mode 100644 index 00000000000000..69a15e10ff0221 --- /dev/null +++ b/ports/gklib/regex.patch @@ -0,0 +1,13 @@ +--- 71aac9f2f8-6ab87cd67d.clean/CMakeLists.txt.old 2026-02-05 23:01:42.685830600 +0100 ++++ 71aac9f2f8-6ab87cd67d.clean/CMakeLists.txt 2026-02-05 23:02:00.820495600 +0100 +@@ -109,6 +109,10 @@ if(NOT HAVE_PCREPOSIX_H) + check_include_file(regex.h HAVE_REGEX_H) + if(NOT HAVE_REGEX_H) + set(USE_GKREGEX ON) ++ else() ++ if(MINGW) ++ target_link_libraries(${PROJECT_NAME} PUBLIC regex) ++ endif() + endif() + endif() + diff --git a/ports/gklib/vcpkg.json b/ports/gklib/vcpkg.json index 32ff41ea0cc31d..b56c29dc8c69fe 100644 --- a/ports/gklib/vcpkg.json +++ b/ports/gklib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gklib", "version-date": "2025-07-06", + "port-version": 1, "description": "General helper libraries for KarypisLab.", "homepage": "https://github.com/KarypisLab/GKlib/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 90130d7a1fd5e5..1af59c574278b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3366,7 +3366,7 @@ }, "gklib": { "baseline": "2025-07-06", - "port-version": 0 + "port-version": 1 }, "gl2ps": { "baseline": "1.4.2", diff --git a/versions/g-/gklib.json b/versions/g-/gklib.json index 482f6b91e40501..f0486b3a2efba1 100644 --- a/versions/g-/gklib.json +++ b/versions/g-/gklib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fcb778964e119e95b4b30606fcea8a3362d79c1", + "version-date": "2025-07-06", + "port-version": 1 + }, { "git-tree": "c3b9e3dbc3c508699816a7723c720428a478b364", "version-date": "2025-07-06",