Merge branch 'deterministic-build' into 'master'

[guix] Deterministic builds

See merge request ogs/ogs!4820

Author: bilke

MaterialLib/SolidModels/MFront/CMakeLists.txt

@@ -26,7 +26,6 @@ if(NOT GUIX_BUILD)
     install(TARGETS MFrontGenericInterface)
 endif()
 
-
 # Setup / build mfront behaviours lib
 set(_mfront_behaviours
     BDT
@@ -69,7 +68,7 @@ if((OGS_BUILD_WHEEL AND NOT APPLE_ARM) OR GUIX_BUILD)
             --interface=generic --silent-build=true # suppresses output
                                                     # (compiler warnings), does
                                                     # not work?
-            --obuild ${_mfront_behaviour_files} # TODO: check for debug?
+            --obuild=level0 ${_mfront_behaviour_files} # TODO: check for debug?
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_generated_mfront_lib}
                 ${_copied_mfront_lib}
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

scripts/cmake/CMakeSetup.cmake

@@ -33,9 +33,6 @@ list(
 
 # Load additional modules
 include(GNUInstallDirs)
-include(ProcessorCount)
-ProcessorCount(NUM_PROCESSORS)
-set(NUM_PROCESSORS ${NUM_PROCESSORS} CACHE STRING "Processor count")
 
 if(NOT PROJECT_IS_TOP_LEVEL)
     set(OGS_BUILD_CLI OFF CACHE BOOL "" FORCE)

scripts/cmake/MarkVariablesAdvanced.cmake

@@ -22,9 +22,7 @@ mark_as_advanced(
     METIS_LIBRARY
     MODULE_CMD
     MPIRUN_TOOL_PATH
-    NUM_PROCESSORS
     ParaView_DIR
-    ProcessorCount_cmd_sysctl
     Qt5Core_DIR
     Qt5Gui_DIR
     Qt5Network_DIR

scripts/cmake/packaging/Pack.cmake

@@ -87,6 +87,9 @@ endif()
 configure_file(Documentation/README.txt.in ${PROJECT_BINARY_DIR}/README.txt)
 install(FILES ${PROJECT_BINARY_DIR}/README.txt DESTINATION .)
 
-install(FILES ${PROJECT_BINARY_DIR}/CMakeCache.txt TYPE INFO)
+if(NOT GUIX_BUILD)
+    # May contain machine specific content, e.g. MPIEXEC_MAX_NUMPROCS
+    install(FILES ${PROJECT_BINARY_DIR}/CMakeCache.txt TYPE INFO)
+endif()
 install(FILES ${PROJECT_BINARY_DIR}/cmake_args TYPE INFO OPTIONAL)
 install(FILES ${PROJECT_BINARY_DIR}/third_party_licenses.txt TYPE INFO)

scripts/guix/channels.scm

@@ -2,7 +2,7 @@
         (name 'guix-ogs)
         (url "https://gitlab.opengeosys.org/ogs/inf/guix-ogs.git")
         (branch "master")
-        (commit "95b4189b8fe00e176f57f834d0731c7f25e8c9f0"))
+        (commit "6b51c1b7216ec1fbd6231720434c3b307bec2c0b"))
       (channel
         (name 'guix)
         (url "https://git.savannah.gnu.org/git/guix.git")