Fix zlib-ng build with cmake 3.31.0 (#110359)

* Fix zlib-ng build with cmake 3.31.0

* Dummy change in JIT

* Use POST_BUILD in add_custom_command

* Normalize paths before install

* Revert dummy change; CI is green

* Update functions.cmake

* Update functions.cmake

* Update src/native/external/zlib-ng/CMakeLists.txt

.github/workflows/jit-format.yml

@@ -28,21 +28,10 @@ jobs:
     container: ${{ matrix.os.container }}
     name: Format jit codebase ${{ matrix.os.name }}
     steps:
-      - name: Checkout jitutils
-        uses: actions/checkout@v4
-        with:
-          path: jitutils
-          repository: dotnet/jitutils
-          ref: main
-          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install .NET
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
-      - name: Build jitutils
-        run: |
-          ./bootstrap${{ matrix.os.extension }}
-        working-directory: jitutils
       - name: Checkout runtime
         uses: actions/checkout@v4
         with:
@@ -52,7 +41,7 @@ jobs:
 
       - name: Run jitformat.py
         run: |
-          python3 runtime/src/coreclr/scripts/jitformat.py --jitutils jitutils -r runtime -o ${{ matrix.os.name }} -a x64 ${{ matrix.os.cross }}
+          python3 runtime/src/coreclr/scripts/jitformat.py -r runtime -o ${{ matrix.os.name }} -a x64 ${{ matrix.os.cross }}
         env:
           ROOTFS_DIR: ${{ matrix.os.rootfs }}
 
@@ -61,4 +50,4 @@ jobs:
         with:
           path: runtime/format.patch
           name: format.${{matrix.os.name}}.patch
-        if: failure()
+        if: failure()

eng/native/functions.cmake

@@ -489,7 +489,8 @@ endfunction()
 
 function(install_symbol_file symbol_file destination_path)
   if(CLR_CMAKE_TARGET_WIN32)
-      install(FILES ${symbol_file} DESTINATION ${destination_path}/PDB ${ARGN})
+      cmake_path(SET DEST NORMALIZE "${destination_path}/PDB")
+      install(FILES ${symbol_file} DESTINATION ${DEST} ${ARGN})
   else()
       install(FILES ${symbol_file} DESTINATION ${destination_path} ${ARGN})
   endif()

src/coreclr/nativeaot/Runtime/Full/CMakeLists.txt

@@ -92,8 +92,9 @@ endif()
 add_custom_command(
     # The AsmOffsets.cs is consumed later by the managed build
     TARGET Runtime.WorkstationGC
-    COMMAND ${CMAKE_CXX_COMPILER} ${COMPILER_LANGUAGE} ${DEFINITIONS} ${PREPROCESSOR_FLAGS} -I"${ARCH_SOURCES_DIR}" "${ASM_OFFSETS_CSPP}" >"${CMAKE_CURRENT_BINARY_DIR}/AsmOffsets.cs"
-    DEPENDS "${RUNTIME_DIR}/AsmOffsets.cpp" "${RUNTIME_DIR}/AsmOffsets.h"
+    POST_BUILD
+    COMMAND ${CMAKE_CXX_COMPILER} ${COMPILER_LANGUAGE} ${DEFINITIONS} ${PREPROCESSOR_FLAGS}
+            -I"${ARCH_SOURCES_DIR}" "${ASM_OFFSETS_CSPP}" >"${CMAKE_CURRENT_BINARY_DIR}/AsmOffsets.cs"
 )
 
 add_custom_command(

src/native/external/zlib-ng-version.txt

@@ -10,3 +10,5 @@ We have removed the following folders from our local copy as these files are not
 - zlib-ng/arch/s390/self-hosted-builder/
 
 Also, if the next version does not yet contain the fixes included in 12bc7edc73308f017ec40c6b2db694a6e3490ac2, cherry-pick it as a patch.
+
+Apply https://github.com/zlib-ng/zlib-ng/pull/1812

src/native/external/zlib-ng/CMakeLists.txt

@@ -1,8 +1,6 @@
-cmake_minimum_required(VERSION 3.5.1)
+cmake_minimum_required(VERSION 3.5.1...3.29.0)
 if(CMAKE_VERSION VERSION_LESS 3.12)
     cmake_policy(VERSION ${CMAKE_VERSION})
-else()
-    cmake_policy(VERSION 3.5.1...3.29.0)
 endif()
 message(STATUS "Using CMake version ${CMAKE_VERSION}")