Static library fixes

Author: 9EOR9

CMakeLists.txt

@@ -119,10 +119,12 @@ IF(UNIX)
   SEARCH_LIBRARY(LIBSOCKET setsockopt "socket")
   SEARCH_LIBRARY(LIBDL dlopen "dl")
   SEARCH_LIBRARY(LIBM floor m)
-  SET(EXTRA_LIBS "${LIBNSL}" "${LIBBIND}" "${LIBSOCKET}" "${LIBDL}" "${LIBM}" "${LIBZ}")
+  SEARCH_LIBRARY(LIBICONV iconv iconv)
+  SEARCH_LIBRARY(LIBPTHREAD pthread_getspecific "pthread;pthreads")
+  SET(EXTRA_LIBS "${LIBNSL}" "${LIBBIND}" "${LIBSOCKET}")
   FIND_PACKAGE(Threads)
-  SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND}
-                               ${LIBSOCKET} ${LIBDL} ${LIBM} ${CMAKE_THREAD_LIBS_INIT})
+  SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV}
+    ${LIBSOCKET} ${LIBDL} ${LIBM} ${LIBPTHREAD})
   #remove possible dups from required libraries
   LIST(LENGTH CMAKE_REQUIRED_LIBRARIES rllength)
   IF(${rllength} GREATER 0)

cmake/SearchLibrary.cmake

@@ -5,9 +5,9 @@ FUNCTION(SEARCH_LIBRARY library_name function liblist)
   IF(${${library_name}})
     RETURN()
   ENDIF()
-  CHECK_FUNCTION_EXISTS(${function} HAVE_${function}_IN_LIBC)
+  CHECK_FUNCTION_EXISTS(${function} ${function}_IS_SYS_FUNC)
   # check if function is part of libc
-  IF(HAVE_${function}_IN_LIBC)
+  IF(HAVE_${function}_IS_SYS_FUNC)
     SET(${library_name} "" PARENT_SCOPE)
     RETURN()
   ENDIF()

libmariadb/CMakeLists.txt

@@ -146,13 +146,16 @@ ENDIF()
 
 ADD_LIBRARY(mariadblib_core OBJECT ${LIBMARIADB_SOURCES})
 ADD_LIBRARY(mariadbclient STATIC $<TARGET_OBJECTS:mariadblib_core>)
-TARGET_LINK_LIBRARIES(mariadbclient ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${MATH_LIBRARY} ${ICONV_LIBRARIES})
+IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCC)
+  SET_TARGET_PROPERTIES(mariadbclient PROPERTIES COMPILE_FLAGS "-fPIC")
+ENDIF()
+TARGET_LINK_LIBRARIES(mariadbclient ${LIBPTHREAD} ${LIBDL} ${LIBM} ${LIBICONV})
 IF(OPENSSL_FOUND)
   TARGET_LINK_LIBRARIES(mariadbclient ${SSL_LIBRARIES})
 ENDIF()
 
 ADD_LIBRARY(libmariadb SHARED $<TARGET_OBJECTS:mariadblib_core>)
-TARGET_LINK_LIBRARIES(libmariadb ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${MATH_LIBRARY} ${ICONV_LIBRARIES})
+TARGET_LINK_LIBRARIES(libmariadb ${LIBPTHREAD} ${LIBDL} ${LIBM} ${LIBICONV})
 
 IF(OPENSSL_FOUND)
   TARGET_LINK_LIBRARIES(libmariadb ${SSL_LIBRARIES})