**4.11.2**

23/10/2021
        resolve issue #116
        Library will not compile on CENTOS 7 (use of threads)

Author: jonjoliver

CMakeLists.txt

@@ -57,7 +57,7 @@ project(TLSH)
 
 set(VERSION_MAJOR 4)
 set(VERSION_MINOR 11)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 
 # TLSH uses only half the counting buckets.
 # It can use all the buckets now.
@@ -139,8 +139,9 @@ endif()
 
 # user can override CXX; make sure tests link and load properly regardless of LD_LIBRARY_PATH
 if(CMAKE_COMPILER_IS_GNUCXX)
-    # previously used:    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc")
-    set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++")
+    # issue #116 Library will not compile on CENTOS 7
+    # set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++")
+    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc")
 endif()
 
 # from https://stackoverflow.com/questions/5395309/how-do-i-force-cmake-to-include-pthread-option-during-compilation

Change_History.md

@@ -724,3 +724,10 @@ TIME	ms= 21.00	per million iterations
 	resolve issue #115
 	CREATE_LINK does not work on CENTOS 7
 </PRE>
+
+**4.11.2**
+<PRE>
+23/10/2021
+	resolve issue #116
+	Library will not compile on CENTOS 7 (use of threads)
+</PRE>

README.md

@@ -299,11 +299,11 @@ TLSH similarity is expressed as a difference score:
 
 # Current Version
 
-**4.11.1**
+**4.11.2**
 <PRE>
-22/10/2021
-	resolve issue #115
-	CREATE_LINK does not work on CENTOS 7
+23/10/2021
+	resolve issue #116
+	Library will not compile on CENTOS 7 (use of threads)
 </PRE>
 
 # Change History

include/tlsh_win_version.h

@@ -7,7 +7,7 @@
 
 #define VERSION_MAJOR		4
 #define VERSION_MINOR		11
-#define VERSION_PATCH		1
+#define VERSION_PATCH		2
 #define TLSH_HASH		"compact hash"
 #define TLSH_CHECKSUM		"1 byte checksum"
 

src/CMakeLists.txt

@@ -57,7 +57,7 @@ endif()
 
 set(TLSH_SRCS tlsh.cpp tlsh_impl.cpp tlsh_util.cpp input_desc.cpp shared_file_functions.cpp)
 add_library(tlsh_static STATIC ${TLSH_SRCS})
-target_link_libraries(tlsh_static PRIVATE Threads::Threads)
+target_link_libraries(tlsh_static PRIVATE)
 set_target_properties(tlsh_static PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
 set_target_properties(tlsh_static PROPERTIES OUTPUT_NAME tlsh${BUILD_POSTFIX})
 
@@ -72,7 +72,7 @@ endif()
 
 if(TLSH_SHARED_LIBRARY EQUAL 1)
     add_library(tlsh_shared SHARED ${TLSH_SRCS})
-    target_link_libraries(tlsh_shared PRIVATE Threads::Threads)
+    target_link_libraries(tlsh_shared PRIVATE)
     set_target_properties(tlsh_shared PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
     set_target_properties(tlsh_shared PROPERTIES OUTPUT_NAME tlsh${BUILD_POSTFIX})
     set_target_properties(tlsh_shared PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"

src/tlsh_impl.cpp

@@ -358,7 +358,9 @@ static void raw_fast_update5_private(
 	unsigned char *slide_window
 	);
 
+#ifdef THREADING_IMPLEMENTED
 #include <thread>
+#endif
 
 struct raw_args {
 	// inputs
@@ -386,6 +388,7 @@ void thread2()
 
 void TlshImpl::fast_update5(const unsigned char* data, unsigned int len, int tlsh_option)
 {
+#ifdef THREADING_IMPLEMENTED
 	if ((len >= 10000) && (tlsh_option & TLSH_OPTION_THREADED)) {
 		unsigned len2A = len / 2;
 		unsigned len2B = len - len2A;
@@ -423,6 +426,7 @@ void TlshImpl::fast_update5(const unsigned char* data, unsigned int len, int tls
 		}
 		return;
 	}
+#endif
 	if (tlsh_option & TLSH_OPTION_PRIVATE) {
 		raw_fast_update5_private(data, len, this->data_len, this->a_bucket,                               this->slide_window);
 		this->data_len += len;

test/CMakeLists.txt

@@ -53,41 +53,41 @@
 
 add_executable(simple_unittest simple_unittest.cpp)
 target_link_libraries(simple_unittest PRIVATE tlsh_static)
-target_link_libraries(simple_unittest PRIVATE Threads::Threads)
+target_link_libraries(simple_unittest PRIVATE)
 set_target_properties(simple_unittest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 set_target_properties(simple_unittest PROPERTIES OUTPUT_NAME simple_unittest${BUILD_POSTFIX})
 
 add_executable(tlsh_unittest tlsh_unittest.cpp)
 target_link_libraries(tlsh_unittest PRIVATE tlsh_static)
-target_link_libraries(tlsh_unittest PRIVATE Threads::Threads)
+target_link_libraries(tlsh_unittest PRIVATE)
 set_target_properties(tlsh_unittest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 set_target_properties(tlsh_unittest PROPERTIES OUTPUT_NAME tlsh_unittest${BUILD_POSTFIX})
 set_target_properties(tlsh_unittest PROPERTIES SKIP_BUILD_RPATH TRUE)
 
 add_executable(timing_unittest timing_unittest.cpp)
 target_link_libraries(timing_unittest PRIVATE tlsh_static)
-target_link_libraries(timing_unittest PRIVATE Threads::Threads)
+target_link_libraries(timing_unittest PRIVATE)
 set_target_properties(timing_unittest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 set_target_properties(timing_unittest PROPERTIES OUTPUT_NAME timing_unittest${BUILD_POSTFIX})
 set_target_properties(timing_unittest PROPERTIES SKIP_BUILD_RPATH TRUE)
 
 add_executable(order_bug order_bug.cpp)
 target_link_libraries(order_bug PRIVATE tlsh_static)
-target_link_libraries(order_bug PRIVATE Threads::Threads)
+target_link_libraries(order_bug PRIVATE)
 set_target_properties(order_bug PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 set_target_properties(order_bug PROPERTIES OUTPUT_NAME order_bug${BUILD_POSTFIX})
 set_target_properties(order_bug PROPERTIES SKIP_BUILD_RPATH TRUE)
 
 add_executable(tlsh_pattern tlsh_pattern.cpp)
 target_link_libraries(tlsh_pattern PRIVATE tlsh_static)
-target_link_libraries(tlsh_pattern PRIVATE Threads::Threads)
+target_link_libraries(tlsh_pattern PRIVATE)
 set_target_properties(tlsh_pattern PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 set_target_properties(tlsh_pattern PROPERTIES OUTPUT_NAME tlsh_pattern${BUILD_POSTFIX})
 set_target_properties(tlsh_pattern PROPERTIES SKIP_BUILD_RPATH TRUE)
 
 add_executable(tlsh_parts tlsh_parts.cpp)
 target_link_libraries(tlsh_parts PRIVATE tlsh_static)
-target_link_libraries(tlsh_parts PRIVATE Threads::Threads)
+target_link_libraries(tlsh_parts PRIVATE)
 set_target_properties(tlsh_parts PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 set_target_properties(tlsh_parts PROPERTIES OUTPUT_NAME tlsh_parts${BUILD_POSTFIX})
 set_target_properties(tlsh_parts PROPERTIES SKIP_BUILD_RPATH TRUE)

utils/CMakeLists.txt

@@ -54,7 +54,7 @@
 
 add_executable(rand_tags rand_tags.cpp)
 target_link_libraries(rand_tags PRIVATE tlsh_static)
-target_link_libraries(rand_tags PRIVATE Threads::Threads)
+target_link_libraries(rand_tags PRIVATE)
 set_target_properties(rand_tags PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 set_target_properties(rand_tags PROPERTIES OUTPUT_NAME rand_tags${BUILD_POSTFIX})