diff options
| author |   Brian Evans <grknight@gentoo.org> | 2017-07-26 20:35:52 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2017-07-26 20:35:52 -0400 |
| commit | 6576db8b7f70c48f3f5a40462423172a432f577a (patch) | |
| tree | cb6b393c19ffd28012b48780ac2d8a5ecbad1711 | |
| parent | Add missing section for clientlibs patch on mariadb-10.2.7 (diff) | |
| download | mysql-extras-6576db8b7f70c48f3f5a40462423172a432f577a.tar.gz mysql-extras-6576db8b7f70c48f3f5a40462423172a432f577a.tar.bz2 mysql-extras-6576db8b7f70c48f3f5a40462423172a432f577a.zip | |
Add missing section for clientlibs patch on mariadb-10.2.7 part 2mysql-extras-20170727-0052Z
| -rw-r--r-- | 20018_all_mariadb-10.2.7-without-clientlibs-tools.patch | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch index adcf12f..4ffeb99 100644 --- a/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch @@ -115,21 +115,6 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL INSTALL(TARGETS libmariadb COMPONENT SharedLibraries DESTINATION ${INSTALL_LIBDIR}) -@@ -427,9 +427,11 @@ - - IF(WITH_MYSQLCOMPAT) - create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) -- create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) -- create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) -- create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) -+# create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) -+ IF(ENABLE_STATIC_LIBS) -+ create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) -+# create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) -+ ENDIF(WITH_STATIC_LIBS) - ENDIF() - - diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt --- a/scripts/CMakeLists.txt 2017-05-14 19:13:18.000000000 -0400 +++ b/scripts/CMakeLists.txt 2017-06-28 12:56:23.774081970 -0400 @@ -156,3 +141,21 @@ diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh +diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeLists.txt +--- a/libmariadb/libmariadb/CMakeLists.txt 2017-07-26 20:26:17.094481997 -0400 ++++ b/libmariadb/libmariadb/CMakeLists.txt 2017-07-26 20:31:47.042608316 -0400 +@@ -427,9 +427,11 @@ + + IF(WITH_MYSQLCOMPAT) + create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) +- create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) +- create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) +- create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) ++# create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) ++ IF(ENABLE_STATIC_LIBS) ++ create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) ++# create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) ++ ENDIF(ENABLE_STATIC_LIBS) + ENDIF() + + |