ports/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake
Bernard Spil 7d6e883166 databases/mariadb104-server: Security update to 10.4.21
databases/mariadb105-server: Update to 10.5.12

 * Update/fix i386 build [1]

PR:		257047 [1]
Reported by:	Raymond Quakkelaar <r quakkelaar quaras nl>
Security:	38a4a043-e937-11eb-9b84-d4c9ef517024
MFH:		2021Q3
2021-08-08 19:58:16 +00:00

44 lines
1.8 KiB
CMake

--- storage/innobase/lz4.cmake.orig 2021-08-02 18:07:03 UTC
+++ storage/innobase/lz4.cmake
@@ -17,20 +17,28 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
MACRO (MYSQL_CHECK_LZ4)
IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
- CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB)
- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
-
- IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
- SET(HAVE_INNODB_LZ4 TRUE)
- ADD_DEFINITIONS(-DHAVE_LZ4=1)
- IF (HAVE_LZ4_COMPRESS_DEFAULT)
- ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
+ find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
+ find_library(LZ4_LIBRARY NAMES lz4)
+ IF (LZ4_LIBRARY)
+ get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY)
+# MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}")
+ IF (LZ4_INCLUDE_DIR)
+ SET(HAVE_LZ4_H YES)
ENDIF()
- LINK_LIBRARIES(lz4)
- ELSE()
- IF (WITH_INNODB_LZ4 STREQUAL "ON")
- MESSAGE(FATAL_ERROR "Required lz4 library is not found")
+ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB)
+ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT)
+
+ IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
+ SET(HAVE_INNODB_LZ4 TRUE)
+ ADD_DEFINITIONS(-DHAVE_LZ4=1)
+ IF (HAVE_LZ4_COMPRESS_DEFAULT)
+ ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
+ ENDIF()
+ LINK_LIBRARIES(innobase ${LZ4_LIBRARY})
+ ELSE()
+ IF (WITH_INNODB_LZ4 STREQUAL "ON")
+ MESSAGE(FATAL_ERROR "Required lz4 library is not found")
+ ENDIF()
ENDIF()
ENDIF()
ENDIF()