Some final review comments, sort lists, add comment and add empty line

Author: raulcd

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -4640,6 +4640,9 @@ function(build_orc)
     set(ZLIB_HOME
         ${ZLIB_ROOT}
         CACHE STRING "" FORCE)
+    # From CMake 3.21 onwards the set(CACHE) command does not remove any normal
+    # variable of the same name from the current scope. We have to manually remove
+    # the variable via unset to avoid ORC not finding the ZLIB_LIBRARY.
     unset(ZLIB_LIBRARY)
     set(ZLIB_LIBRARY
         ZLIB::ZLIB
@@ -4674,6 +4677,7 @@ function(build_orc)
     set(STOP_BUILD_ON_WARNING
         OFF
         CACHE BOOL "" FORCE)
+
     fetchcontent_makeavailable(orc)
 
     add_library(orc::orc INTERFACE IMPORTED)

docker-compose.yml

@@ -1591,11 +1591,11 @@ services:
         - ${REPO}:r-${R_ORG}-${R_IMAGE}-${R_TAG}
       args:
         base: ${R_ORG}/${R_IMAGE}:${R_TAG}
+        cmake: ${CMAKE}
         r_dev: ${ARROW_R_DEV}
         tz: ${TZ}
         r_prune_deps: ${R_PRUNE_DEPS}
         r_custom_ccache: ${R_CUSTOM_CCACHE}
-        cmake: ${CMAKE}
     shm_size: *shm-size
     environment:
       <<: [*common, *sccache]
@@ -2045,9 +2045,9 @@ services:
       cache_from:
         - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-verify-rc
       args:
-        repo: ${REPO}
         arch: ${ARCH}
         cmake: ${CMAKE}
+        repo: ${REPO}
     volumes:
       - .:/arrow:delegated
       - ${DOCKER_VOLUME_PREFIX}ubuntu-ccache:/ccache:delegated