microsoft · BillyONeal · Feb 19, 2025 · Feb 8, 2025 · Feb 8, 2025 · Feb 8, 2025
diff --git a/ports/gettext-libintl/portfile.cmake b/ports/gettext-libintl/portfile.cmake
@@ -90,9 +90,8 @@ endif()
 
 file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log")
 file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-dbg.log")
-vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime/intl"
-    DETERMINE_BUILD_TRIPLET
-    USE_WRAPPERS
+vcpkg_make_configure(
+    SOURCE_PATH "${SOURCE_PATH}/gettext-runtime/intl"
     OPTIONS
         ${OPTIONS}
     OPTIONS_RELEASE
@@ -116,7 +115,7 @@ foreach(file IN LISTS makefiles)
     file(WRITE "${file}" "${rules}")
 endforeach()
 
-vcpkg_install_make()
+vcpkg_make_install()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

diff --git a/ports/gettext-libintl/vcpkg.json b/ports/gettext-libintl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gettext-libintl",
   "version": "0.22.5",
-  "port-version": 2,
+  "port-version": 3,
   "description": "The libintl C library from GNU gettext-runtime.",
   "homepage": "https://www.gnu.org/software/gettext/",
   "license": "LGPL-2.1-or-later",
@@ -12,9 +12,8 @@
       "platform": "!linux"
     },
     {
-      "name": "vcpkg-cmake",
-      "host": true,
-      "platform": "linux"
+      "name": "vcpkg-make",
+      "host": true
     }
   ]
 }
diff --git a/ports/icu/cleanup_msvc.patch b/ports/icu/cleanup_msvc.patch
@@ -0,0 +1,17 @@
+diff --git a/source/config/mh-msys-msvc b/source/config/mh-msys-msvc
+index 6f50798ebf..2f1a2d6e69 100644
+--- a/source/config/mh-msys-msvc
++++ b/source/config/mh-msys-msvc
+@@ -90,10 +90,10 @@ LIBSICU = $(STATIC_PREFIX)$(ICUPREFIX)
+ A = lib
+
+ # Cygwin's ar can't handle Win64 right now. So we use Microsoft's tool instead.
+-AR = LIB.EXE#M#
+-ARFLAGS := -nologo $(ARFLAGS:r=)#M#
++AR := $(AR)#M#
++ARFLAGS := $(ARFLAGS)#M#
+ RANLIB = ls -s#M#
+ AR_OUTOPT = -OUT:#M#
+
+ ## An import library is needed for z-OS, MSVC and Cygwin
+ IMPORT_LIB_EXT = .lib
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
@@ -1,18 +1,3 @@
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    message(WARNING "${PORT} currently requires the following programs from the system package manager:
-    autoconf automake autoconf-archive
-On Debian and Ubuntu derivatives:
-    sudo apt-get install autoconf automake autoconf-archive
-On recent Red Hat and Fedora derivatives:
-    sudo dnf install autoconf automake autoconf-archive
-On Arch Linux and derivatives:
-    sudo pacman -S autoconf automake autoconf-archive
-On Alpine:
-    apk add autoconf automake autoconf-archive
-On macOS:
-    brew install autoconf automake autoconf-archive\n")
-endif()
-
 string(REGEX MATCH "^[0-9]*" ICU_VERSION_MAJOR "${VERSION}")
 string(REPLACE "." "_" VERSION2 "${VERSION}")
 string(REPLACE "." "-" VERSION3 "${VERSION}")
@@ -37,6 +22,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
         vcpkg-cross-data.patch
         darwin-rpath.patch
         mingw-strict-ansi.diff # backport of https://github.com/unicode-org/icu/pull/3003
+        cleanup_msvc.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)
@@ -47,12 +33,12 @@ vcpkg_list(SET BUILD_OPTIONS)
 
 if(VCPKG_TARGET_IS_EMSCRIPTEN)
     vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras)
-    vcpkg_list(APPEND BUILD_OPTIONS "PKGDATA_OPTS=--without-assembly -O ../data/icupkg.inc")
+    vcpkg_list(APPEND BUILD_OPTIONS "\"PKGDATA_OPTS=--without-assembly -O ../data/icupkg.inc\"")
 elseif(VCPKG_TARGET_IS_UWP)
     vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras ac_cv_func_tzset=no ac_cv_func__tzset=no)
     string(APPEND VCPKG_C_FLAGS " -DU_PLATFORM_HAS_WINUWP_API=1")
     string(APPEND VCPKG_CXX_FLAGS " -DU_PLATFORM_HAS_WINUWP_API=1")
-    vcpkg_list(APPEND BUILD_OPTIONS "PKGDATA_OPTS=--windows-uwp-build -O ../data/icupkg.inc")
+    vcpkg_list(APPEND BUILD_OPTIONS "\"PKGDATA_OPTS=--windows-uwp-build -O ../data/icupkg.inc\"")
 elseif(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     vcpkg_list(APPEND CONFIGURE_OPTIONS --enable-rpath)
     if(DEFINED CMAKE_INSTALL_NAME_DIR)
@@ -79,12 +65,9 @@ elseif(VCPKG_CROSSCOMPILING)
     list(APPEND CONFIGURE_OPTIONS "--with-cross-build=${_VCPKG_TOOL_PATH}")
 endif()
 
-vcpkg_configure_make(
-    SOURCE_PATH "${SOURCE_PATH}"
-    PROJECT_SUBPATH source
-    AUTOCONFIG
-    DETERMINE_BUILD_TRIPLET
-    ADDITIONAL_MSYS_PACKAGES autoconf-archive
+vcpkg_make_configure(
+    SOURCE_PATH "${SOURCE_PATH}/source"
+    AUTORECONF
     OPTIONS
         ${CONFIGURE_OPTIONS}
         --disable-samples
@@ -97,7 +80,7 @@ vcpkg_configure_make(
         --enable-debug
         --disable-release
 )
-vcpkg_install_make(OPTIONS ${BUILD_OPTIONS})
+vcpkg_make_install(OPTIONS ${BUILD_OPTIONS})
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/share"
@@ -158,6 +141,7 @@ vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../" IGNORE_UNCHANGED)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_HOST_INSTALLED_DIR}" "`dirname $0`/../../../../${_HOST_TRIPLET}/" IGNORE_UNCHANGED)
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "icu",
   "version": "74.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Mature and widely used Unicode and localization library.",
   "homepage": "https://icu.unicode.org/home",
   "license": "ICU",
@@ -12,6 +12,10 @@
       "features": [
         "tools"
       ]
+    },
+    {
+      "name": "vcpkg-make",
+      "host": true
     }
   ],
   "features": {

diff --git a/ports/vcpkg-make/portfile.cmake b/ports/vcpkg-make/portfile.cmake
@@ -27,6 +27,7 @@ file(INSTALL
 file(INSTALL 
         "${automake_source}/lib/ar-lib"
         "${automake_source}/lib/compile"
+        "${CMAKE_CURRENT_LIST_DIR}/wrappers/"
     DESTINATION 
         "${CURRENT_PACKAGES_DIR}/share/${PORT}/wrappers"
 )

diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "vcpkg-make",
-  "version-date": "2025-01-13",
-  "port-version": 1,
+  "version-date": "2025-02-08",
   "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure",
   "license": null,
   "supports": "native",

diff --git a/ports/vcpkg-make/vcpkg_make.cmake b/ports/vcpkg-make/vcpkg_make.cmake
@@ -101,7 +101,7 @@ function(vcpkg_run_autoreconf shell_cmd work_dir)
 endfunction()
 
 function(vcpkg_make_setup_win_msys msys_out)
-    list(APPEND msys_require_packages autoconf-wrapper automake-wrapper binutils libtool make which)
+    list(APPEND msys_require_packages autoconf-wrapper automake-wrapper autoconf-archive binutils libtool make which)
     vcpkg_insert_msys_into_path(msys PACKAGES ${msys_require_packages})
     find_program(PKGCONFIG NAMES pkgconf NAMES_PER_DIR PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf" NO_DEFAULT_PATH)
     set("${msys_out}" "${msys}" PARENT_SCOPE)

diff --git a/ports/vcpkg-make/vcpkg_make_common.cmake b/ports/vcpkg-make/vcpkg_make_common.cmake
@@ -274,9 +274,8 @@ function(z_vcpkg_make_prepare_programs out_env)
         list(TRANSFORM progs PREPEND "VCPKG_DETECTED_CMAKE_")
         foreach(prog IN LISTS progs)
             set(filepath "${${prog}}")
-            if(filepath MATCHES " ")
-                # CHECK: Uncertain if the compile wrappers work with absolute paths containing C:\\ 
-                cmake_path(GET filepath FILENAME ${prog})
+            if("${filepath}" MATCHES " " AND EXISTS "${${prog}}")
+                cmake_path(GET filepath FILENAME "${prog}")
                 vcpkg_insert_program_into_path("${filepath}")
             endif()
         endforeach()
@@ -298,8 +297,11 @@ function(z_vcpkg_make_prepare_programs out_env)
 
             z_vcpkg_append_to_configure_environment(configure_env RC "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}")
             z_vcpkg_append_to_configure_environment(configure_env WINDRES "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}")
-            if(VCPKG_DETECTED_CMAKE_AR)
+            if(VCPKG_DETECTED_CMAKE_AR AND NOT "${VCPKG_DETECTED_CMAKE_AR}" MATCHES "llvm-ar")
                 z_vcpkg_append_to_configure_environment(configure_env AR "ar-lib ${VCPKG_DETECTED_CMAKE_AR}")
+            elseif("${VCPKG_DETECTED_CMAKE_AR}" MATCHES "llvm-ar")
+                # llvm-lib does not understand /EXTRACT so llvm-ar needs to be used. However, llvm-ar cannot use the ar-lib wrapper.
+                z_vcpkg_append_to_configure_environment(configure_env AR "${VCPKG_DETECTED_CMAKE_AR}")
             else()
                 z_vcpkg_append_to_configure_environment(configure_env AR "ar-lib lib.exe -verbose")
             endif()

diff --git a/ports/vcpkg-make/vcpkg_make_install.cmake b/ports/vcpkg-make/vcpkg_make_install.cmake
@@ -23,13 +23,13 @@ function(vcpkg_make_install)
 
     # Can be set in the triplet to append options for configure
     if(DEFINED VCPKG_MAKE_OPTIONS)
-        list(APPEND arg_OPTIONS ${VCPKG_MAKE_OPTIONS})
+        vcpkg_list(APPEND arg_OPTIONS ${VCPKG_MAKE_OPTIONS})
     endif()
     if(DEFINED VCPKG_MAKE_OPTIONS_RELEASE)
-        list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MAKE_OPTIONS_RELEASE})
+        vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MAKE_OPTIONS_RELEASE})
     endif()
     if(DEFINED VCPKG_MAKE_OPTIONS_DEBUG)
-        list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MAKE_OPTIONS_DEBUG})
+        vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MAKE_OPTIONS_DEBUG})
     endif()
 
     if(CMAKE_HOST_WIN32)

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3090,7 +3090,7 @@
     },
     "gettext-libintl": {
       "baseline": "0.22.5",
-      "port-version": 2
+      "port-version": 3
     },
     "gettimeofday": {
       "baseline": "2017-10-14",
@@ -3578,7 +3578,7 @@
     },
     "icu": {
       "baseline": "74.2",
-      "port-version": 4
+      "port-version": 5
     },
     "ideviceinstaller": {
       "baseline": "2023-07-21",
@@ -9529,8 +9529,8 @@
       "port-version": 0
     },
     "vcpkg-make": {
-      "baseline": "2025-01-13",
-      "port-version": 1
+      "baseline": "2025-02-08",
+      "port-version": 0
     },
     "vcpkg-msbuild": {
       "baseline": "2023-08-08",

diff --git a/versions/g-/gettext-libintl.json b/versions/g-/gettext-libintl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "89734e29d2753df206cdd0e45f2f6c9b3f3fbc4f",
+      "version": "0.22.5",
+      "port-version": 3
+    },
     {
       "git-tree": "f41e983c85004eb6ee8d290ecb2465832fce8c00",
       "version": "0.22.5",

diff --git a/versions/i-/icu.json b/versions/i-/icu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "91b03be43850140e64dba01dcadc8b3f73b1083b",
+      "version": "74.2",
+      "port-version": 5
+    },
     {
       "git-tree": "291bbc492b8f73dea0dbd12051e9b12b21aef900",
       "version": "74.2",

diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "84480c9e9de4cc4cf60f44d5de24c79d61dfe966",
+      "version-date": "2025-02-08",
+      "port-version": 0
+    },
     {
       "git-tree": "276b846fcad524729ffbf6fe1c8b7598cfeac91a",
       "version-date": "2025-01-13",