From 302d685ac6e675526b414308fc12a154c4128988 Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Sun, 28 May 2017 20:52:49 +0000 Subject: databases/mariadb102-server: Add MariaDB 10.2 ports - Add mariadb102-client port - Add RocksDB storage engine - Add non-base page compressors - First sweep at making cmake patches upstreamable --- .../files/patch-extra_CMakeLists.txt | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 databases/mariadb102-client/files/patch-extra_CMakeLists.txt (limited to 'databases/mariadb102-client/files/patch-extra_CMakeLists.txt') diff --git a/databases/mariadb102-client/files/patch-extra_CMakeLists.txt b/databases/mariadb102-client/files/patch-extra_CMakeLists.txt new file mode 100644 index 000000000000..95e7e7f4d845 --- /dev/null +++ b/databases/mariadb102-client/files/patch-extra_CMakeLists.txt @@ -0,0 +1,35 @@ +--- extra/CMakeLists.txt.orig 2017-04-04 19:11:33 UTC ++++ extra/CMakeLists.txt +@@ -46,6 +46,7 @@ ADD_CUSTOM_TARGET(GenError + DEPENDS + ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) + TARGET_LINK_LIBRARIES(my_print_defaults mysys) + +@@ -84,15 +85,19 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_ + ) + + ++IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) + TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) + ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() ++ENDIF() + + MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) + TARGET_LINK_LIBRARIES(replace mysys) ++ENDIF() + + IF(UNIX) ++IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) + +@@ -102,3 +107,4 @@ IF(UNIX) + MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) + TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) + ENDIF() ++ENDIF() -- cgit v1.2.3