From e6e3afb0a06658acf1e26b66cb9597c7252fb8c3 Mon Sep 17 00:00:00 2001 From: Undefine Date: Fri, 12 Sep 2025 14:41:28 +0200 Subject: [PATCH 1/2] Add VCPKG_TARGET_IS_BSD and VCPKG_HOST_IS_BSD In most places where there's a check for either FreeBSD or OpenBSD we probably want to be checking for BSD in general and this will make adding support for systems like NetBSD or DragonFly easier. --- scripts/cmake/vcpkg_common_definitions.cmake | 4 ++++ scripts/cmake/vcpkg_configure_make.cmake | 2 +- scripts/ports.cmake | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 922354dd7a1c77..2df65d8cab0022 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -21,8 +21,10 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") set(VCPKG_TARGET_IS_ANDROID ON) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(VCPKG_TARGET_IS_FREEBSD ON) + set(VCPKG_TARGET_IS_BSD ON) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") set(VCPKG_TARGET_IS_OPENBSD ON) + set(VCPKG_TARGET_IS_BSD ON) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "SunOS") set(VCPKG_TARGET_IS_SOLARIS ON) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") @@ -41,8 +43,10 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(VCPKG_HOST_IS_LINUX ON) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(VCPKG_HOST_IS_FREEBSD ON) + set(VCPKG_HOST_IS_BSD ON) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") set(VCPKG_HOST_IS_OPENBSD ON) + set(VCPKG_HOST_IS_BSD ON) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "SunOS") set(VCPKG_HOST_IS_SOLARIS ON) endif() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 68120e1df348db..95b013f4751113 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -900,7 +900,7 @@ function(vcpkg_configure_make) # Export matching make program for vcpkg_build_make (cache variable) if(CMAKE_HOST_WIN32 AND MSYS_ROOT) find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) - elseif(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD) + elseif(VCPKG_HOST_IS_BSD) find_program(Z_VCPKG_MAKE gmake REQUIRED) elseif(VCPKG_HOST_IS_SOLARIS) find_program(Z_VCPKG_MAKE NAMES gmake make REQUIRED) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 5d2d0df9083fd7..87db34d00fb269 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -212,7 +212,7 @@ target system or to the host system. Use a prefixed variable instead. if(DEFINED PORT) # Always fixup RPATH on linux, osx and bsds unless explicitly disabled. - if(VCPKG_FIXUP_ELF_RPATH OR ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD) AND NOT DEFINED VCPKG_FIXUP_ELF_RPATH)) + if(VCPKG_FIXUP_ELF_RPATH OR ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_BSD) AND NOT DEFINED VCPKG_FIXUP_ELF_RPATH)) z_vcpkg_fixup_rpath_in_dir() endif() if(VCPKG_FIXUP_MACHO_RPATH OR (VCPKG_TARGET_IS_OSX AND NOT DEFINED VCPKG_FIXUP_MACHO_RPATH)) From 51c1d25d7f6ef94592dd60f4ef055d8b85019046 Mon Sep 17 00:00:00 2001 From: Undefine Date: Mon, 29 Sep 2025 17:23:32 +0200 Subject: [PATCH 2/2] [vcpkg-make] Switch to using VCPKG_HOST_IS_BSD --- ports/vcpkg-make/vcpkg.json | 2 +- ports/vcpkg-make/vcpkg_make_configure.cmake | 2 +- ports/vcpkg-make/vcpkg_make_install.cmake | 2 +- versions/baseline.json | 2 +- versions/v-/vcpkg-make.json | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json index e0235960fc5c21..17886ad90105ca 100644 --- a/ports/vcpkg-make/vcpkg.json +++ b/ports/vcpkg-make/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-make", - "version-date": "2025-09-19", + "version-date": "2025-09-29", "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure", "license": null, "supports": "native", diff --git a/ports/vcpkg-make/vcpkg_make_configure.cmake b/ports/vcpkg-make/vcpkg_make_configure.cmake index 0f984df8765b10..4d633f35d44ff0 100644 --- a/ports/vcpkg-make/vcpkg_make_configure.cmake +++ b/ports/vcpkg-make/vcpkg_make_configure.cmake @@ -133,7 +133,7 @@ function(vcpkg_make_configure) EMMAKEN_JUST_CONFIGURE ) - if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD) + if(VCPKG_HOST_IS_BSD) find_program(Z_VCPKG_MAKE gmake REQUIRED) else() find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED) diff --git a/ports/vcpkg-make/vcpkg_make_install.cmake b/ports/vcpkg-make/vcpkg_make_install.cmake index 71530efdbd184d..02d8bc5e3c7ee8 100644 --- a/ports/vcpkg-make/vcpkg_make_install.cmake +++ b/ports/vcpkg-make/vcpkg_make_install.cmake @@ -41,7 +41,7 @@ function(vcpkg_make_install) vcpkg_make_get_shell(shell_var) set(shell_cmd "${shell_var}") - if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD) + if(VCPKG_HOST_IS_BSD) find_program(Z_VCPKG_MAKE gmake REQUIRED) else() find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED) diff --git a/versions/baseline.json b/versions/baseline.json index c2b8547a762840..d78d6118c02e38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10061,7 +10061,7 @@ "port-version": 0 }, "vcpkg-make": { - "baseline": "2025-09-19", + "baseline": "2025-09-29", "port-version": 0 }, "vcpkg-msbuild": { diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json index 0ddfb49bf8dd10..9875eb9d39fc38 100644 --- a/versions/v-/vcpkg-make.json +++ b/versions/v-/vcpkg-make.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73a90e27dfaf176bb25ec339e8b3077054de52da", + "version-date": "2025-09-29", + "port-version": 0 + }, { "git-tree": "11501b3c7cff0f97a1c3e0200ff1b3c6d043e643", "version-date": "2025-09-19",