diff options
Diffstat (limited to '20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch')
| -rw-r--r-- | 20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch b/20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch index 85e9786..8e37835 100644 --- a/20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch +++ b/20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch @@ -56,26 +56,23 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt --- a/extra/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400 +++ b/extra/CMakeLists.txt 2015-06-24 10:37:31.879169100 -0400 -@@ -54,12 +54,14 @@ +@@ -54,10 +54,15 @@ DEPENDS ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) --MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) --TARGET_LINK_LIBRARIES(my_print_defaults mysys) +IF(NOT WITHOUT_CLIENTLIBS) -+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) -+ TARGET_LINK_LIBRARIES(my_print_defaults mysys) - --MYSQL_ADD_EXECUTABLE(perror perror.c) --ADD_DEPENDENCIES(perror GenError) --TARGET_LINK_LIBRARIES(perror mysys) -+ MYSQL_ADD_EXECUTABLE(perror perror.c) -+ ADD_DEPENDENCIES(perror GenError) -+ TARGET_LINK_LIBRARIES(perror mysys) + MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++MYSQL_ADD_EXECUTABLE(perror perror.c) ++ELSE(NOT WITHOUT_CLIENTLIBS) ++ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++ADD_EXECUTABLE(perror perror.c) +ENDIF(NOT WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(my_print_defaults mysys) - IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolveip resolveip.c) +-MYSQL_ADD_EXECUTABLE(perror perror.c) + ADD_DEPENDENCIES(perror GenError) + TARGET_LINK_LIBRARIES(perror mysys) + diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt --- a/scripts/CMakeLists.txt 2015-06-24 10:28:12.800169100 -0400 +++ b/scripts/CMakeLists.txt 2015-06-24 10:42:49.682169100 -0400 @@ -118,3 +115,19 @@ diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} COMPONENT SharedLibraries) +diff -aurN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh +--- a/scripts/mysql_install_db.sh 2018-08-04 18:20:58.000000000 -0400 ++++ b/scripts/mysql_install_db.sh 2018-08-09 12:23:28.707894151 -0400 +@@ -280,10 +280,10 @@ + print_defaults="$builddir/extra/my_print_defaults" + elif test -n "$basedir" + then +- print_defaults=`find_in_dirs my_print_defaults $basedir/bin $basedir/extra` ++ print_defaults=`find_in_dirs my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra` + if test -z "$print_defaults" + then +- cannot_find_file my_print_defaults $basedir/bin $basedir/extra ++ cannot_find_file my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra + exit 1 + fi + else |