microsoft · Neumann-A · Aug 15, 2023 · Aug 15, 2023 · Aug 16, 2023 · Aug 17, 2023
diff --git a/ports/coin-or-cbc/portfile.cmake b/ports/coin-or-cbc/portfile.cmake
@@ -12,10 +12,8 @@ file(COPY "${CURRENT_INSTALLED_DIR}/share/coin-or-buildtools/" DESTINATION "${SO
 
 set(ENV{ACLOCAL} "aclocal -I \"${SOURCE_PATH}/BuildTools\"")
 
-vcpkg_configure_make(
+vcpkg_make_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DETERMINE_BUILD_TRIPLET
-    USE_WRAPPERS
     OPTIONS
         --with-coinutils
         --with-clp
@@ -29,7 +27,7 @@ vcpkg_configure_make(
         --disable-readline
 )
 
-vcpkg_install_make()
+vcpkg_make_install()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 

diff --git a/ports/coin-or-cbc/vcpkg.json b/ports/coin-or-cbc/vcpkg.json
@@ -1,13 +1,18 @@
 {
   "name": "coin-or-cbc",
   "version-date": "2023-02-01",
+  "port-version": 1,
   "description": "Cbc (Coin-or branch and cut) is an open-source mixed integer linear programming solver written in C++.",
   "homepage": "https://github.com/coin-or/Cbc",
   "license": "EPL-2.0",
   "dependencies": [
     "coin-or-cgl",
     "coin-or-clp",
     "coin-or-osi",
-    "coinutils"
+    "coinutils",
+    {
+      "name": "vcpkg-make",
+      "host": true
+    }
   ]
 }
diff --git a/ports/gmp/asmflags.patch b/ports/gmp/asmflags.patch
@@ -7,7 +7,7 @@ index 86175ce42..8228d20dc 100644
  [$1]
  EOF
 -gmp_assemble="$CCAS $CFLAGS $CPPFLAGS conftest.s >conftest.out 2>&1"
-+gmp_assemble="$CCAS $CPPFLAGS $ASMFLAGS conftest.s >conftest.out 2>&1"
++gmp_assemble="$CCAS $CPPFLAGS $CCASFLAGS conftest.s >conftest.out 2>&1"
  if AC_TRY_EVAL(gmp_assemble); then
    cat conftest.out >&AC_FD_CC
    ifelse([$2],,:,[$2])
@@ -16,7 +16,7 @@ index 86175ce42..8228d20dc 100644
  	addl	$ ${tmp_underscore}_GLOBAL_OFFSET_TABLE_, %ebx
  EOF
 -  gmp_compile="$CCAS $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC"
-+  gmp_compile="$CCAS $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC"
++  gmp_compile="$CCAS $CPPFLAGS $CCASFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CPPFLAGS $CCASFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC"
    if AC_TRY_EVAL(gmp_compile); then
      if test "$tmp_underscore" = "_"; then
        gmp_cv_asm_x86_got_underscore=yes
@@ -25,7 +25,7 @@ index 86175ce42..8228d20dc 100644
    AC_MSG_WARN([| WARNING WARNING WARNING])
    AC_MSG_WARN([| Host CPU has MMX code, but the assembler])
 -  AC_MSG_WARN([|     $CCAS $CFLAGS $CPPFLAGS])
-+  AC_MSG_WARN([|     $CCAS $CPPFLAGS $ASMFLAGS])
++  AC_MSG_WARN([|     $CCAS $CPPFLAGS $CCASFLAGS])
    AC_MSG_WARN([| has the Solaris 2.6 and 2.7 bug where register to register])
    AC_MSG_WARN([| movq operands are reversed.])
    AC_MSG_WARN([| Non-MMX replacements will be used.])
@@ -40,7 +40,7 @@ index 5d7306c22..75692128d 100644
 +# Only used with CCAS
  COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 -	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS)
-+	$(CPPFLAGS) $(ASMFLAGS)
++	$(CPPFLAGS) $(CCASFLAGS)
 
  # Flags used for preprocessing (in ansi2knr rules).
  #
diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake
@@ -30,66 +30,47 @@ endif()
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     vcpkg_list(APPEND OPTIONS
-        "ac_cv_func_memset=yes"
         "gmp_cv_asm_w32=.word"
         "gmp_cv_check_libm_for_build=no"
     )
 endif()
 
 set(disable_assembly OFF)
-set(ccas "")
-set(asmflags "-c")
-vcpkg_cmake_get_vars(cmake_vars_file)
-include("${cmake_vars_file}")
-if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+set(languages "C;CXX")
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-        string(APPEND asmflags " --target=i686-pc-windows-msvc")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-        string(APPEND asmflags " --target=x86_64-pc-windows-msvc")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-        string(APPEND asmflags " --target=arm64-pc-windows-msvc")
     else()
         set(disable_assembly ON)
     endif()
-    if(NOT disable_assembly)
-        vcpkg_find_acquire_program(CLANG)
-        set(ccas "${CLANG}")
-    endif()
 elseif(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     # not exporting asm functions
     set(disable_assembly ON)
-elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
-    vcpkg_list(APPEND OPTIONS "ABI=32")
-    string(APPEND asmflags " -m32")
-else()
-    set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
 endif()
 
 if(disable_assembly)
     vcpkg_list(APPEND OPTIONS "--enable-assembly=no")
-elseif(ccas)
-    cmake_path(GET ccas PARENT_PATH ccas_dir)
-    vcpkg_add_to_path("${ccas_dir}")
-    cmake_path(GET ccas FILENAME ccas_command)
+else()
+    list(APPEND languages "ASM")
 endif()
-vcpkg_list(APPEND OPTIONS "CCAS=${ccas_command}" "ASMFLAGS=${asmflags}")
 
 if(VCPKG_CROSSCOMPILING)
     set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}")
 endif()
 
-vcpkg_configure_make(
-    SOURCE_PATH "${SOURCE_PATH}"
+vcpkg_make_configure(
     AUTOCONFIG
+    SOURCE_PATH "${SOURCE_PATH}"
+    LANGUAGES ${languages}
     OPTIONS
         ${OPTIONS}
         --enable-cxx
         --with-pic
         --with-readline=no
         "gmp_cv_prog_exeext_for_build=${VCPKG_HOST_EXECUTABLE_SUFFIX}"
 )
-vcpkg_install_make()
+vcpkg_make_install()
 vcpkg_fixup_pkgconfig()
 
 if(NOT VCPKG_CROSSCOMPILING)

diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gmp",
   "version": "6.3.0",
+  "port-version": 1,
   "description": "The GNU Multiple Precision Arithmetic Library",
   "homepage": "https://gmplib.org",
   "license": "LGPL-3.0-only OR GPL-2.0-only",
@@ -11,7 +12,7 @@
       "host": true
     },
     {
-      "name": "vcpkg-cmake-get-vars",
+      "name": "vcpkg-make",
       "host": true
     }
   ],

diff --git a/ports/jemalloc/portfile.cmake b/ports/jemalloc/portfile.cmake
@@ -12,14 +12,16 @@ if(VCPKG_TARGET_IS_WINDOWS)
     set(opts "ac_cv_search_log=none required" "--without-private-namespace")
 endif()
 
-vcpkg_configure_make(
-    SOURCE_PATH "${SOURCE_PATH}"
+vcpkg_make_configure(
     AUTOCONFIG
-    NO_WRAPPERS
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_MSVC_WRAPPERS
+    NO_MSVC_FLAG_ESCAPING
+    USE_RESPONSE_FILES
     OPTIONS ${opts}
 )
 
-vcpkg_install_make()
+vcpkg_make_install()
 
 if(VCPKG_TARGET_IS_WINDOWS)
     file(COPY "${SOURCE_PATH}/include/msvc_compat/strings.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/jemalloc/msvc_compat")

diff --git a/ports/jemalloc/vcpkg.json b/ports/jemalloc/vcpkg.json
@@ -1,8 +1,14 @@
 {
   "name": "jemalloc",
   "version": "5.3.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support",
   "homepage": "https://jemalloc.net/",
-  "license": "BSD-2-Clause"
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-make",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake
@@ -38,11 +38,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 set(ENV{GTKDOCIZE} true)
-vcpkg_configure_make(
+vcpkg_make_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    AUTOCONFIG
     COPY_SOURCE # include dir order problem
-    USE_WRAPPERS
     OPTIONS
         ${options}
         --disable-gtk-doc
@@ -57,7 +55,7 @@ vcpkg_configure_make(
         "CFLAGS=\$CFLAGS -I${CURRENT_INSTALLED_DIR}/include"
 )
 
-vcpkg_install_make()
+vcpkg_make_install()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
 

diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "libidn2",
   "version": "2.3.4",
-  "port-version": 3,
+  "port-version": 4,
   "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.",
   "homepage": "https://www.gnu.org/software/libidn/",
   "license": null,
   "dependencies": [
     "libiconv",
-    "libunistring"
+    "libunistring",
+    {
+      "name": "vcpkg-make",
+      "host": true
+    }
   ],
   "features": {
     "nls": {

diff --git a/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt
@@ -195,6 +195,7 @@ foreach(flag ${VCPKG_LANGUAGES} SHARED_LINKER EXE_LINKER STATIC_LINKER MODULE_LI
             endif()
         endif()
     endif()
+    string(STRIP "${${flag}_FLAGS}" "${flag}_FLAGS")
     escaped(value "${${flag}_FLAGS}")
     string(APPEND OUTPUT_STRING "set(VCPKG_COMBINED_${flag}_FLAGS_${VCPKG_CONFIGS} \"${value}\")\n")
 endforeach()

diff --git a/ports/vcpkg-cmake-get-vars/vcpkg.json b/ports/vcpkg-cmake-get-vars/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-cmake-get-vars",
-  "version-date": "2023-12-31",
+  "version-date": "2024-01-30",
   "documentation": "https://vcpkg.io/en/docs/README.html",
   "license": "MIT",
   "dependencies": [

diff --git a/ports/vcpkg-make/portfile.cmake b/ports/vcpkg-make/portfile.cmake
@@ -0,0 +1,34 @@
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
+
+vcpkg_download_distfile(
+    ar_lib_wrapper
+    URLS https://raw.githubusercontent.com/autotools-mirror/automake/43a53bdf4b76377b5c012b8c8e8f478fb56d1ec0/lib/ar-lib
+    FILENAME ar-lib
+    SHA512 6019ffebf4b7b0547aa018c7d19bc915a228825d2acdee953a36919a88c30352e620f61c27a3e6f701af2885c8eb8d4ba3a4a3c2e821c54c03dceeef8eec108f
+)
+vcpkg_download_distfile(
+    compile_wrapper
+    URLS https://raw.githubusercontent.com/autotools-mirror/automake/43a53bdf4b76377b5c012b8c8e8f478fb56d1ec0/lib/compile
+    FILENAME compile
+    SHA512 3ef82f486f59be4cae1f1f95a9b70d4404f0333100be84c2e7061bd466201224a2bd1c7d871d97801eb9a441809bb47e7821fca8c85c29cc43ab15e6edda7f8c
+)
+
+file(COPY 
+        "${CMAKE_CURRENT_LIST_DIR}/" 
+    DESTINATION 
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
+file(COPY 
+        "${ar_lib_wrapper}"
+        "${compile_wrapper}"
+    DESTINATION 
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}/wrappers"
+)
+
+file(REMOVE 
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}/portfile.cmake"
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg.json"
+)
+
+vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt")
+
diff --git a/ports/vcpkg-make/vcpkg-port-config.cmake b/ports/vcpkg-make/vcpkg-port-config.cmake
@@ -0,0 +1,8 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake")
+
+# Or this file should be autogenerated somehow. 
+file(GLOB cmake_files "${CMAKE_CURRENT_LIST_DIR}/*.cmake")
+list(REMOVE_ITEM cmake_files "${CMAKE_CURRENT_LIST_FILE}")
+foreach(cmake_file IN LISTS cmake_files)
+    include("${cmake_file}")
+endforeach()
diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "vcpkg-make",
+  "version-date": "2023-05-15",
+  "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-make.html",
+  "license": "MIT",
+  "supports": "native",
+  "dependencies": [
+    {
+      "name": "pkgconf",
+      "host": true,
+      "platform": "windows"
+    },
+    "vcpkg-cmake-get-vars"
+  ]
+}