Commit 9c3f27f for zlib

commit 9c3f27f28bd4b6c09ca297a7c513311e6f22a684
Author: Mark Adler <git@madler.net>
Date:   Sun Oct 25 11:56:45 2026 -0700

    Update contrib/ada for cmake 4.4.

diff --git a/contrib/ada/cmake/Modules/CMakeADAInformation.cmake b/contrib/ada/cmake/Modules/CMakeADAInformation.cmake
index d0bcf4f..c31d0ee 100644
--- a/contrib/ada/cmake/Modules/CMakeADAInformation.cmake
+++ b/contrib/ada/cmake/Modules/CMakeADAInformation.cmake
@@ -68,7 +68,7 @@ endif(NOT CMAKE_ADA_COMPILE_OBJECT)
 if(NOT CMAKE_ADA_LINK_EXECUTABLE)
     set(CMAKE_ADA_LINK_EXECUTABLE
         "${CMAKE_ADA_BINDER_HELPER} <CMAKE_ADA_COMPILER> <OBJECTS> FLAGS <FLAGS> <LINK_FLAGS>"
-        "${CMAKE_ADA_EXE_LINK_HELPER} <CMAKE_ADA_COMPILER> <TARGET> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> OBJ <OBJECTS> LIBS <LINK_LIBRARIES>")
+        "${CMAKE_ADA_EXE_LINK_HELPER} <CMAKE_ADA_COMPILER> <TARGET> <FLAGS> <LINK_FLAGS> OBJ <OBJECTS> LIBS <LINK_LIBRARIES>")
 endif(NOT CMAKE_ADA_LINK_EXECUTABLE)

 function(ada_add_executable)
diff --git a/contrib/ada/cmake/Modules/CMakeDetermineADACompiler.cmake b/contrib/ada/cmake/Modules/CMakeDetermineADACompiler.cmake
index 1562a6c..e25ae94 100644
--- a/contrib/ada/cmake/Modules/CMakeDetermineADACompiler.cmake
+++ b/contrib/ada/cmake/Modules/CMakeDetermineADACompiler.cmake
@@ -21,11 +21,11 @@ endif(NOT CMAKE_ADA_COMPILER)

 mark_as_advanced(CMAKE_ADA_COMPILER)
 set(CMAKE_ADA_COMPILER_ID "GNU")
-set(CMAKE_ADA_BINDER_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/binder_helper.cmake")
-set(CMAKE_ADA_COMPILER_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compile_helper.cmake")
-set(CMAKE_ADA_EXE_LINK_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/exe_link_helper.cmake")
-set(CMAKE_ADA_SHARED_LINK_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/shared_link_helper.cmake")
-set(CMAKE_ADA_STATIC_LINK_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/static_link_helper.cmake")
+set(CMAKE_ADA_BINDER_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/binder_helper.cmake --")
+set(CMAKE_ADA_COMPILER_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compile_helper.cmake --")
+set(CMAKE_ADA_EXE_LINK_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/exe_link_helper.cmake --")
+set(CMAKE_ADA_SHARED_LINK_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/shared_link_helper.cmake --")
+set(CMAKE_ADA_STATIC_LINK_HELPER "${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/static_link_helper.cmake --")

 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/CMakeADACompiler.cmake.in
diff --git a/contrib/ada/cmake/binder_helper.cmake b/contrib/ada/cmake/binder_helper.cmake
index b38d3b1..5738bd0 100644
--- a/contrib/ada/cmake/binder_helper.cmake
+++ b/contrib/ada/cmake/binder_helper.cmake
@@ -1,20 +1,21 @@
 #CMAKE_ARGV0 = /path/to/cmake
 #CMAKE_ARGV1 = -P
 #CMAKE_ARGV2 = path/to/this/file
-#CMAKE_ARGV3 = binder
-#CMAKE_ARGV4 = ali
+#CMAKE_ARGV3 = --
+#CMAKE_ARGV4 = binder
+#CMAKE_ARGV5 = ali

-if(NOT CMAKE_ARGV3)
+if(NOT CMAKE_ARGV4)
     message(FATAL_ERROR "binder not set")
-endif(NOT CMAKE_ARGV3)
+endif(NOT CMAKE_ARGV4)

-string(REPLACE ".o" ".ali" ALIPATH ${CMAKE_ARGV4})
+string(REPLACE ".o" ".ali" ALIPATH ${CMAKE_ARGV5})
 cmake_path(GET ALIPATH FILENAME ALI)
 cmake_path(REMOVE_FILENAME ALIPATH OUTPUT_VARIABLE ALI_SEARCH_PATH)

 set (REACHED_FLAGS FALSE)
 #iterate over additional objects, only the main one is needed
-foreach(arg RANGE 5 ${CMAKE_ARGC})
+foreach(arg RANGE 6 ${CMAKE_ARGC})
     if(CMAKE_ARGV${arg} STREQUAL FLAGS)
         set(REACHED_FLAGS TRUE)
         continue()
@@ -29,18 +30,18 @@ foreach(arg RANGE 5 ${CMAKE_ARGC})
     if(REACHED_FLAGS)
         list(APPEND FLAGS ${CMAKE_ARGV${arg}})
     endif(REACHED_FLAGS)
-endforeach(arg RANGE 5 CMAKE_ARGC)
+endforeach(arg RANGE 6 CMAKE_ARGC)

 list(APPEND FLAGS "-aO${ALI_SEARCH_PATH}")

 #first see if there is a main function
-execute_process(COMMAND ${CMAKE_ARGV3} bind ${ALI} ${FLAGS}
+execute_process(COMMAND ${CMAKE_ARGV4} bind ${ALI} ${FLAGS}
                 RESULT_VARIABLE MAIN_RESULT
                 OUTPUT_VARIABLE dont_care
                 ERROR_VARIABLE ERROR)

 if(MAIN_RESULT)
-    execute_process(COMMAND ${CMAKE_ARGV3} bind -n ${ALI} ${FLAGS}
+    execute_process(COMMAND ${CMAKE_ARGV4} bind -n ${ALI} ${FLAGS}
                     RESULT_VARIABLE RESULT
                     OUTPUT_VARIABLE dont_care
                     ERROR_VARIABLE ERROR)
@@ -50,4 +51,4 @@ if(RESULT)
     message(FATAL_ERROR ${RESULT} ${ERROR})
 endif(RESULT)

-execute_process(COMMAND ${CMAKE_ARGV0} -E touch "${CMAKE_ARGV4}")
+execute_process(COMMAND ${CMAKE_ARGV0} -E touch "${CMAKE_ARGV5}")
diff --git a/contrib/ada/cmake/compile_helper.cmake b/contrib/ada/cmake/compile_helper.cmake
index fe4821e..24b34c0 100644
--- a/contrib/ada/cmake/compile_helper.cmake
+++ b/contrib/ada/cmake/compile_helper.cmake
@@ -1,28 +1,29 @@
 #CMAKE_ARGV0 = /path/to/cmake
 #CMAKE_ARGV1 = -P
 #CMAKE_ARGV2 = path/to/this/file
-#CMAKE_ARGV3 = compiler
-#CMAKE_ARGV4 = OBJECT-DIR
-#CMAKE_ARGV5 = source-file
-
-if(NOT CMAKE_ARGV3)
-    message(FATAL_ERROR "compiler not set")
-endif(NOT CMAKE_ARGV3)
+#CMAKE_ARGV3 = --
+#CMAKE_ARGV4 = compiler
+#CMAKE_ARGV5 = OBJECT-DIR
+#CMAKE_ARGV6 = source-file

 if(NOT CMAKE_ARGV4)
-    message(FATAL_ERROR "object dir not set")
+    message(FATAL_ERROR "compiler not set")
 endif(NOT CMAKE_ARGV4)

 if(NOT CMAKE_ARGV5)
-    message(FATAL_ERROR "source not set")
+    message(FATAL_ERROR "object dir not set")
 endif(NOT CMAKE_ARGV5)

-foreach(arg RANGE 6 ${CMAKE_ARGC})
+if(NOT CMAKE_ARGV6)
+    message(FATAL_ERROR "source not set")
+endif(NOT CMAKE_ARGV6)
+
+foreach(arg RANGE 7 ${CMAKE_ARGC})
     list(APPEND FLAGS "${CMAKE_ARGV${arg}}")
-endforeach(arg RANGE 6 ${CMAKE_ARGC})
+endforeach(arg RANGE 7 ${CMAKE_ARGC})

-execute_process(COMMAND ${CMAKE_ARGV3} compile ${FLAGS} ${CMAKE_ARGV5}
-                WORKING_DIRECTORY ${CMAKE_ARGV4}
+execute_process(COMMAND ${CMAKE_ARGV4} compile ${FLAGS} ${CMAKE_ARGV6}
+                WORKING_DIRECTORY ${CMAKE_ARGV5}
                 RESULT_VARIABLE RESULT
                 OUTPUT_VARIABLE dont_care
                 ERROR_VARIABLE ERROR)
diff --git a/contrib/ada/cmake/exe_link_helper.cmake b/contrib/ada/cmake/exe_link_helper.cmake
index d556cc4..2d83ca3 100644
--- a/contrib/ada/cmake/exe_link_helper.cmake
+++ b/contrib/ada/cmake/exe_link_helper.cmake
@@ -1,19 +1,20 @@
 #CMAKE_ARGV0 = /path/to/cmake
 #CMAKE_ARGV1 = -P
 #CMAKE_ARGV2 = path/to/this/file
-#CMAKE_ARGV3 = linker
-#CMAKE_ARGV4 = output-name
-#CMAKE_ARGV5...CMAKE_AGVN = OBJECTS
+#CMAKE_ARGV3 = --
+#CMAKE_ARGV4 = linker
+#CMAKE_ARGV5 = output-name
+#CMAKE_ARGV6...CMAKE_AGVN = OBJECTS
 #CMAKE_ARGVN+1 = LIBS
 #CMAKE_ARGVN+2...CMAKE_ARGVM libraries

-if(NOT CMAKE_ARGV3)
+if(NOT CMAKE_ARGV4)
     message(FATAL_ERROR "linker not set")
-endif(NOT CMAKE_ARGV3)
+endif(NOT CMAKE_ARGV4)

 set(REACHED_LIBS FALSE)
 set(REACHED_OBJ FALSE)
-foreach(arg RANGE 5 ${CMAKE_ARGC})
+foreach(arg RANGE 6 ${CMAKE_ARGC})
     if(CMAKE_ARGV${arg} STREQUAL LIBS)
         set(REACHED_LIBS TRUE)
         set(REACHED_OBJ FALSE)
@@ -42,9 +43,9 @@ foreach(arg RANGE 5 ${CMAKE_ARGC})
             list(APPEND FLAGS "${CMAKE_ARGV${arg}}")
         endif(NOT start STREQUAL -aO)
     endif(REACHED_LIBS)
-endforeach(arg RANGE 5 ${CMAKE_ARGC})
+endforeach(arg RANGE 6 ${CMAKE_ARGC})

-execute_process(COMMAND ${CMAKE_ARGV3} link ${ALI} -o ${CMAKE_ARGV4} ${FLAGS} ${OTHER_OBJECTS} ${LIBS}
+execute_process(COMMAND ${CMAKE_ARGV4} link ${ALI} -o ${CMAKE_ARGV5} ${FLAGS} ${OTHER_OBJECTS} ${LIBS}
                 RESULT_VARIABLE RESULT
                 OUTPUT_VARIABLE dont_care
                 ERROR_VARIABLE ERROR)
diff --git a/contrib/ada/cmake/shared_link_helper.cmake b/contrib/ada/cmake/shared_link_helper.cmake
index baea9a1..fa33bf3 100644
--- a/contrib/ada/cmake/shared_link_helper.cmake
+++ b/contrib/ada/cmake/shared_link_helper.cmake
@@ -1,18 +1,19 @@
 #CMAKE_ARGV0 = /path/to/cmake
 #CMAKE_ARGV1 = -P
 #CMAKE_ARGV2 = path/to/this/file
-#CMAKE_ARGV3 = linker
-#CMAKE_ARGV4 = output-name
-#CMAKE_ARGV5...CMAKE_AGVN = OBJECTS
+#CMAKE_ARGV3 = --
+#CMAKE_ARGV4 = linker
+#CMAKE_ARGV5 = output-name
+#CMAKE_ARGV6...CMAKE_AGVN = OBJECTS
 #CMAKE_ARGVN+1 = LIBS
 #CMAKE_ARGVN+2...CMAKE_ARGVM libraries

-if(NOT CMAKE_ARGV3)
+if(NOT CMAKE_ARGV4)
     message(FATAL_ERROR "linker not set")
-endif(NOT CMAKE_ARGV3)
+endif(NOT CMAKE_ARGV4)

 set(REACHED_FILES FALSE)
-foreach(arg RANGE 5 ${CMAKE_ARGC})
+foreach(arg RANGE 6 ${CMAKE_ARGC})
     if(CMAKE_ARGV${arg} STREQUAL "LIBS")
         set(REACHED_FILES TRUE)
         continue()
@@ -27,7 +28,7 @@ foreach(arg RANGE 5 ${CMAKE_ARGC})
     else(REACHED_LIBS)
         list(APPEND OBJECT_FILES "${CMAKE_ARGV${arg}}")
     endif(REACHED_LIBS)
-endforeach(arg RANGE 5 ${CMAKE_ARGC})
+endforeach(arg RANGE 6 ${CMAKE_ARGC})

 file(WRITE dummylib.adb
     "procedure dummylib is\n"
@@ -35,14 +36,14 @@ file(WRITE dummylib.adb
     "   null;\n"
     "end;\n")

-execute_process(COMMAND ${CMAKE_ARGV3} compile -fPIC dummylib.adb
+execute_process(COMMAND ${CMAKE_ARGV4} compile -fPIC dummylib.adb
                 OUTPUT_VARIABLE dont_care
                 ERROR_VARIABLE ERROR)
-execute_process(COMMAND ${CMAKE_ARGV3} bind -n dummylib.ali
+execute_process(COMMAND ${CMAKE_ARGV4} bind -n dummylib.ali
                 OUTPUT_VARIABLE dont_care
                 ERROR_VARIABLE ERROR)

-execute_process(COMMAND ${CMAKE_ARGV3} link -shared dummylib.ali -o ${CMAKE_ARGV4} ${OBJECT_FILES} ${LIBS}
+execute_process(COMMAND ${CMAKE_ARGV4} link -shared dummylib.ali -o ${CMAKE_ARGV5} ${OBJECT_FILES} ${LIBS}
                 RESULT_VARIABLE RESULT
                 OUTPUT_VARIABLE dont_care
                 ERROR_VARIABLE ERROR)
diff --git a/contrib/ada/cmake/static_link_helper.cmake b/contrib/ada/cmake/static_link_helper.cmake
index eb3ff2b..0593f30 100644
--- a/contrib/ada/cmake/static_link_helper.cmake
+++ b/contrib/ada/cmake/static_link_helper.cmake
@@ -1,21 +1,22 @@
 #CMAKE_ARGV0 = /path/to/cmake
 #CMAKE_ARGV1 = -P
 #CMAKE_ARGV2 = path/to/this/file
-#CMAKE_ARGV3 = path/to/ar
-#CMAKE_ARGV4 = output-name
-#CMAKE_ARGV5...CMAKE_AGVN = OBJECTS
+#CMAKE_ARGV3 = --
+#CMAKE_ARGV4 = path/to/ar
+#CMAKE_ARGV5 = output-name
+#CMAKE_ARGV6...CMAKE_AGVN = OBJECTS

-if(NOT CMAKE_ARGV3)
+if(NOT CMAKE_ARGV4)
     message(FATAL_ERROR "linker not set")
-endif(NOT CMAKE_ARGV3)
+endif(NOT CMAKE_ARGV4)

-foreach(arg RANGE 5 ${CMAKE_ARGC})
+foreach(arg RANGE 6 ${CMAKE_ARGC})
     if(NOT CMAKE_ARGC EQUAL arg)
         list(APPEND OBJECT_FILES "${CMAKE_ARGV${arg}}")
     endif(NOT CMAKE_ARGC EQUAL arg)
-endforeach(arg RANGE 6 ${CMAKE_ARGC})
+endforeach(arg RANGE 7 ${CMAKE_ARGC})

-execute_process(COMMAND ${CMAKE_ARGV3} rcs ${CMAKE_ARGV4} ${OBJECT_FILES}
+execute_process(COMMAND ${CMAKE_ARGV4} rcs ${CMAKE_ARGV5} ${OBJECT_FILES}
                 RESULT_VARIABLE RESULT
                 OUTPUT_VARIABLE dont_care
                 ERROR_VARIABLE ERROR)