Mirrors/opencv
0
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-01-18 17:21:42 +01:00
Code Packages Releases Activity

Merge pull request #27979 from ssam18:fix-reproducible-builds-27961

Browse Source 
Fix #27961: Support reproducible builds by making host system version optional
This commit is contained in:
Alexander Smorkalov
2025-11-14 10:21:12 +03:00
committed by GitHub
parent 9dbae59760 7224bced8b
commit 1abc90c178
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/tbb/CMakeLists.txt vendored
View File

@@ -106,6 +106,11 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
set(TBB_SOURCE_FILES ${lib_srcs} ${lib_hdrs})
set(tbb_version_file "version_string.ver")
if(NOT BUILD_INFO_SKIP_SYSTEM_VERSION)
set(TBB_HOST_VERSION " ${CMAKE_HOST_SYSTEM_VERSION}")
else()
set(TBB_HOST_VERSION "")
endif()
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${tbb_version_file}.cmakein" "${CMAKE_CURRENT_BINARY_DIR}/${tbb_version_file}" @ONLY)
list(APPEND TBB_SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/${tbb_version_file}")

2
3rdparty/tbb/version_string.ver.cmakein vendored
View File

@@ -1,6 +1,6 @@
#define __TBB_VERSION_STRINGS(N) \
#N": BUILD_PACKAGE OpenCV @OPENCV_VERSION@" ENDL \
#N": BUILD_HOST @CMAKE_HOST_SYSTEM_NAME@ @CMAKE_HOST_SYSTEM_VERSION@ @CMAKE_HOST_SYSTEM_PROCESSOR@" ENDL \
#N": BUILD_HOST @CMAKE_HOST_SYSTEM_NAME@@TBB_HOST_VERSION@ @CMAKE_HOST_SYSTEM_PROCESSOR@" ENDL \
#N": BUILD_TARGET @CMAKE_SYSTEM_NAME@ @CMAKE_SYSTEM_VERSION@ @CMAKE_SYSTEM_PROCESSOR@" ENDL \
#N": BUILD_COMPILER @CMAKE_CXX_COMPILER@ (ver @CMAKE_CXX_COMPILER_VERSION@)" ENDL \
#N": BUILD_COMMAND use cv::getBuildInformation() for details" ENDL

6
CMakeLists.txt
View File

@@ -1240,7 +1240,11 @@ endif()
if(OPENCV_TIMESTAMP)
status(" Timestamp:" ${OPENCV_TIMESTAMP})
endif()
status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR})
if(NOT BUILD_INFO_SKIP_SYSTEM_VERSION)
status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR})
else()
status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_PROCESSOR})
endif()
if(CMAKE_CROSSCOMPILING)
status(" Target:" ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR})
endif()