diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2016-01-10 20:07:48 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2016-01-10 20:07:48 +0000 |
| commit | f8d239353c3514a7e0205b49a4a33fab92b07f48 (patch) | |
| tree | b5a40cf04ded95238cb509cd32cab0974fe31146 /databases/mysql57-client/files/patch-extra_CMakeLists.txt | |
| parent | databases/mysql57-client, databases/mysql57-server: (diff) | |
databases/mysql57-client, databases/mysql57-server:
change all files that were missed in the last commit
PR: 204607
Diffstat (limited to 'databases/mysql57-client/files/patch-extra_CMakeLists.txt')
| -rw-r--r-- | databases/mysql57-client/files/patch-extra_CMakeLists.txt | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/databases/mysql57-client/files/patch-extra_CMakeLists.txt b/databases/mysql57-client/files/patch-extra_CMakeLists.txt index bd078ede4a7c..185a6f785e69 100644 --- a/databases/mysql57-client/files/patch-extra_CMakeLists.txt +++ b/databases/mysql57-client/files/patch-extra_CMakeLists.txt @@ -1,6 +1,14 @@ ---- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100 -@@ -60,6 +60,7 @@ +--- extra/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ extra/CMakeLists.txt +@@ -45,6 +45,7 @@ ENDIF() + + ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h + ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys ++ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/ + COMMAND comp_err + --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets + --out-dir=${PROJECT_BINARY_DIR}/sql/share/ +@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY ENDIF() @@ -8,18 +16,18 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -96,11 +97,14 @@ - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) +@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY}) + ADD_DEPENDENCIES(innochecksum GenError) ENDIF() +ENDIF() - IF(UNIX) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + IF(UNIX) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) - SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) + ENDIF() +ENDIF() - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) + # In published release builds on Solaris, we need to bundle gcc source. + # PB2 will take care of putting it in extra/ when needed |