[msys2 scripts] Update, adapt to cygwin MACHTYPE (microsoft#45839)

dg0yt · web-flow · commit 6fa128f2b6e1 · 2025-06-11T12:25:17.000-07:00
diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-make",
-  "version-date": "2025-05-22",
+  "version-date": "2025-06-10",
   "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure",
   "license": null,
   "supports": "native",
diff --git a/ports/vcpkg-make/wrappers/cl_cpp_wrapper b/ports/vcpkg-make/wrappers/cl_cpp_wrapper
@@ -1,11 +1,15 @@
 #!/usr/bin/bash
+
 # cl_cpp_wrapper
-# Wrapper around MS's cl.exe to make it act more like Unix cpp
+# Wrapper around MS's cl.exe to make it act more like Unix cpp,
+# in particular process stdin
 
 PATH="$PATH:/usr/bin"
 
-case $MACHTYPE in
-    *-msys)
+msys2_dll="$(test -f /usr/bin/msys-2.0.dll && echo yes)"
+
+case $msys2_dll,$MACHTYPE in
+    *-msys | yes,*-cygwin)
         slash="-"
         ;;
     *)
diff --git a/scripts/buildsystems/make_wrapper/cl_cpp_wrapper b/scripts/buildsystems/make_wrapper/cl_cpp_wrapper
@@ -1,11 +1,15 @@
 #!/usr/bin/bash
+
 # cl_cpp_wrapper
-# Wrapper around MS's cl.exe to make it act more like Unix cpp
+# Wrapper around MS's cl.exe to make it act more like Unix cpp,
+# in particular process stdin
 
 PATH="$PATH:/usr/bin"
 
-case $MACHTYPE in
-    *-msys)
+msys2_dll="$(test -f /usr/bin/msys-2.0.dll && echo yes)"
+
+case $msys2_dll,$MACHTYPE in
+    *-msys | yes,*-cygwin)
         slash="-"
         ;;
     *)
@@ -84,21 +88,12 @@ fi
 
 input_file="${file:-/proc/self/fd/0}"
 if [ "$input_file" == "/proc/self/fd/0" ]; then
-    #echo "STDIN"
     # CL does not support reading from STDIN so it is wrapped here. 
     tmpout=cpp_wrapper_$RANDOM.h
     /usr/bin/cp $input_file $tmpout
-    # from https://stackoverflow.com/questions/36313562/how-to-redirect-stdin-to-file-in-bash
-    #exec 3> cppstdtmp.h
-    #while IFS= read -r line; do
-    #  printf '%s' "$line"
-    #done
-    #exec 3<&-
-    #echo "$(</dev/stdin)" > cppstdtmp.h
     exec $prog ${cppopt[@]} $tmpout
     rm -f $tmpout
 else
-    #echo "FILE"
     exec $prog ${cppopt[@]} $input_file
 fi
 
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake
diff --git a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake
@@ -1,17 +1,17 @@
 macro(z_vcpkg_find_acquire_pkgconfig_msys_declare_packages)
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://mirror.msys2.org/mingw/clangarm64/mingw-w64-clang-aarch64-pkgconf-1~2.3.0-1-any.pkg.tar.zst"
-        SHA512 b93698fc282f39715804cebeb624608584a0ef0755a6a4e321c4f0571586e91a39b3af580441f4895f5f524db151831a1eb6e06eb4de83f43a0db7b0c218bab0
+        URL "https://mirror.msys2.org/mingw/clangarm64/mingw-w64-clang-aarch64-pkgconf-1~2.4.3-1-any.pkg.tar.zst"
+        SHA512 c2bb144b71bab8d1461c1c56b3b8d0cfe47ff7afd6757cfb5b7d0e887bfa7a9d0e95789da13169f5981a8d555aa4b0a7e2acc841c5a6b06763073f74966f4239
         PROVIDES mingw-w64-clang-aarch64-pkg-config
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-pkgconf-1~2.3.0-1-any.pkg.tar.zst"
-        SHA512 5373f050060678166968e09a4dd8ad30324c5dc37842c3517ebc9eb7be7e09d37d2873ff9dc4831c283556b68a0776f06fa6f91d799020b04282b4a3f378a2c4
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-pkgconf-1~2.4.3-1-any.pkg.tar.zst"
+        SHA512 bd7986cdf104a6e21abc27f270716cf7f93152fdb92733b23dfa0e44465b3e739e9c90a4934419198f856887f1cfe20ba1ef52478b84ea9e795f44e699475e11
         PROVIDES mingw-w64-x86_64-pkg-config
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-pkgconf-1~2.3.0-1-any.pkg.tar.zst"
-        SHA512 8fc9e91dcc78a05e8d836352e91d424e7466eaacbf961fd781ff6d84aab059308942dad024e19ecfe600175241ebfb81bd4813352c3f7547d8c9bfccec962dab
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-pkgconf-1~2.4.3-1-any.pkg.tar.zst"
+        SHA512 22b3f5b2b25628713cae722e351f105f7670bc8364e41fd3bf68d8c86866c273215f2c31d467657ccf0e106eedd7c207ff474173f0eaeba5f2d7130ce6a0d3db
         PROVIDES mingw-w64-i686-pkg-config
     )
 endmacro()
diff --git a/scripts/cmake/vcpkg_find_fortran.cmake b/scripts/cmake/vcpkg_find_fortran.cmake
diff --git a/scripts/test_ports/vcpkg-ci-vcpkg-make/portfile.cmake b/scripts/test_ports/vcpkg-ci-vcpkg-make/portfile.cmake
@@ -1,6 +1,14 @@
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 include("${CURRENT_HOST_INSTALLED_DIR}/share/unit-test-cmake/test-macros.cmake")
 
+if("scripts-cl-cpp-wrapper" IN_LIST FEATURES)
+    include("${CMAKE_CURRENT_LIST_DIR}/test-scripts-cl_cpp_wrapper.cmake")
+endif()
+
+if("vcpkg-make-cl-cpp-wrapper" IN_LIST FEATURES)
+    include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg-make-cl_cpp_wrapper.cmake")
+endif()
+
 if("z-vcpkg-make-prepare-compile-flags" IN_LIST FEATURES)
     include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_make_prepare_compile_flags.cmake")
 endif()
diff --git a/scripts/test_ports/vcpkg-ci-vcpkg-make/test-cl_cpp_wrapper/configure b/scripts/test_ports/vcpkg-ci-vcpkg-make/test-cl_cpp_wrapper/configure
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "${CPP:-cpp} ${CPPFLAGS} ${CFLAGS} ${TEST_FLAGS} >> stdout.c < source.c"
+${CPP:-cpp} ${CPPFLAGS} ${CFLAGS} ${TEST_FLAGS} >> stdout.c < source.c
diff --git a/scripts/test_ports/vcpkg-ci-vcpkg-make/test-cl_cpp_wrapper/source.c b/scripts/test_ports/vcpkg-ci-vcpkg-make/test-cl_cpp_wrapper/source.c
@@ -0,0 +1,5 @@
+#ifdef EXPECT_SUCCESS
+/* okay */
+#else
+#error "Forced error"
+#endif
diff --git a/scripts/test_ports/vcpkg-ci-vcpkg-make/test-scripts-cl_cpp_wrapper.cmake b/scripts/test_ports/vcpkg-ci-vcpkg-make/test-scripts-cl_cpp_wrapper.cmake
@@ -0,0 +1,25 @@
+block()
+set(SOURCE_PATH "${CURRENT_PORT_DIR}/test-cl_cpp_wrapper")
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_backup_env_variables(VARS CPP TEST_FLAGS)
+
+# Test that that CPP processes stdin
+# vcpkg_configure_make picks scripts/buildsystems/make_wrapper/cl_cpp_wrapper
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(ENV{CPP} "cl_cpp_wrapper")
+endif()
+
+unit_test_ensure_fatal_error([[
+    set(ENV{TEST_FLAGS} -DEXPECT_FAILURE)
+    vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE USE_WRAPPERS)
+]])
+
+unit_test_ensure_success([[
+    set(ENV{TEST_FLAGS} -DEXPECT_SUCCESS)
+    vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE USE_WRAPPERS)
+]])
+
+vcpkg_restore_env_variables(VARS CPP TEST_FLAGS)
+endblock()
diff --git a/scripts/test_ports/vcpkg-ci-vcpkg-make/test-vcpkg-make-cl_cpp_wrapper.cmake b/scripts/test_ports/vcpkg-ci-vcpkg-make/test-vcpkg-make-cl_cpp_wrapper.cmake
@@ -0,0 +1,25 @@
+block()
+set(SOURCE_PATH "${CURRENT_PORT_DIR}/test-cl_cpp_wrapper")
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_backup_env_variables(VARS CPP TEST_FLAGS)
+
+# Test that that CPP processes stdin
+# vcpkg_make_configure picks (installed) ports/vcpkg-make/wrappers/cl_cpp_wrapper
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(ENV{CPP} "cl_cpp_wrapper")
+endif()
+
+unit_test_ensure_fatal_error([[
+    set(ENV{TEST_FLAGS} -DEXPECT_FAILURE)
+    vcpkg_make_configure(SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE)
+]])
+
+unit_test_ensure_success([[
+    set(ENV{TEST_FLAGS} -DEXPECT_SUCCESS)
+    vcpkg_make_configure(SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE)
+]])
+
+vcpkg_restore_env_variables(VARS CPP TEST_FLAGS)
+endblock()
diff --git a/scripts/test_ports/vcpkg-ci-vcpkg-make/vcpkg.json b/scripts/test_ports/vcpkg-ci-vcpkg-make/vcpkg.json
@@ -14,6 +14,14 @@
     }
   ],
   "default-features": [
+    {
+      "name": "scripts-cl-cpp-wrapper",
+      "platform": "windows & !mingw"
+    },
+    {
+      "name": "vcpkg-make-cl-cpp-wrapper",
+      "platform": "windows & !mingw"
+    },
     "z-vcpkg-make-normalize-arch",
     "z-vcpkg-make-determine-host-arch",
     "z-vcpkg-make-determine-target-arch",
@@ -23,6 +31,12 @@
     "z-vcpkg-make-z-adapt-lib-link-names"
   ],
   "features": {
+    "scripts-cl-cpp-wrapper": {
+      "description": "Test the cl_cpp_wrapper in scripts"
+    },
+    "vcpkg-make-cl-cpp-wrapper": {
+      "description": "Test the cl_cpp_wrapper in vcpkg-make"
+    },
     "z-vcpkg-make-normalize-arch": {
       "description": "Test the z_vcpkg_make_normalize_arch function"
     },
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -9817,7 +9817,7 @@
       "port-version": 0
     },
     "vcpkg-make": {
-      "baseline": "2025-05-22",
+      "baseline": "2025-06-10",
       "port-version": 0
     },
     "vcpkg-msbuild": {
diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7cfff860ea6693158e803e76511ef38117f86e08",
+      "version-date": "2025-06-10",
+      "port-version": 0
+    },
     {
       "git-tree": "a7724d77ae5bf7883c2130706224d9c88e30b162",
       "version-date": "2025-05-22",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vcpkg-make",`
`3`		`- "version-date": "2025-05-22",`
	`3`	`+ "version-date": "2025-06-10",`
`4`	`4`	`"documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure",`
`5`	`5`	`"license": null,`
`6`	`6`	`"supports": "native",`