diff options
Diffstat (limited to 'community/clamav/cmake-fix-race-condition-with-parallel-builds.patch')
-rw-r--r-- | community/clamav/cmake-fix-race-condition-with-parallel-builds.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/community/clamav/cmake-fix-race-condition-with-parallel-builds.patch b/community/clamav/cmake-fix-race-condition-with-parallel-builds.patch deleted file mode 100644 index 3c118d9f6c2..00000000000 --- a/community/clamav/cmake-fix-race-condition-with-parallel-builds.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c5c3b7558e16dabc6d2c7c7876ac8cd2e23f4caf Mon Sep 17 00:00:00 2001 -From: Alexander Sulfrian <asulfrian@zedat.fu-berlin.de> -Date: Fri, 24 Sep 2021 12:37:43 +0200 -Subject: [PATCH] CMake: Fix race condition with parallel builds - -If running multiple parallel processes of "xor_testfile.py" there was a -race condition between checking for the existence of the directory and -creating it. Now this is handled as a dependency in CMake. ---- - unit_tests/input/CMakeLists.txt | 4 ++++ - unit_tests/input/xor_testfile.py | 3 --- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/unit_tests/input/CMakeLists.txt b/unit_tests/input/CMakeLists.txt -index 3297290d18..7a3ba4bb96 100644 ---- a/unit_tests/input/CMakeLists.txt -+++ b/unit_tests/input/CMakeLists.txt -@@ -62,6 +62,9 @@ if(ENABLE_UNRAR) - ) - endif() - -+add_custom_target(tgt_clamav_hdb_scanfiles ALL -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/clamav_hdb_scanfiles) -+ - # Decrypt test file - function(decrypt_testfile test_file) - add_custom_command(OUTPUT clamav_hdb_scanfiles/${test_file} -@@ -71,6 +74,7 @@ function(decrypt_testfile test_file) - --out_file ${CMAKE_CURRENT_BINARY_DIR}/clamav_hdb_scanfiles/${test_file} - COMMENT "Decrypting test file ${test_file}...") - add_custom_target(tgt_${test_file} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/clamav_hdb_scanfiles/${test_file}) -+ ADD_DEPENDENCIES(tgt_${test_file} tgt_clamav_hdb_scanfiles) - endfunction() - - foreach(TESTFILE ${TESTFILES}) -diff --git a/unit_tests/input/xor_testfile.py b/unit_tests/input/xor_testfile.py -index bacc971faa..41379621b5 100755 ---- a/unit_tests/input/xor_testfile.py -+++ b/unit_tests/input/xor_testfile.py -@@ -53,9 +53,6 @@ def main(): - - # Write out the result to the destination file. - try: -- if not out_file.parent.exists(): -- out_file.parent.mkdir() -- - with out_file.open('w+b') as out_file_fd: - out_file_fd.write(out_file_bytes) - |