diff options
| author |   Brian Evans <grknight@gentoo.org> | 2017-07-26 20:25:18 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2017-07-26 20:25:18 -0400 |
| commit | cf640d262757be9d5137031102555569aa1ac48c (patch) | |
| tree | c3257a0fd748958862fa0575db88528e4668ed04 | |
| parent | Update index for last patch (diff) | |
| download | mysql-extras-cf640d262757be9d5137031102555569aa1ac48c.tar.gz mysql-extras-cf640d262757be9d5137031102555569aa1ac48c.tar.bz2 mysql-extras-cf640d262757be9d5137031102555569aa1ac48c.zip | |
Add missing section for clientlibs patch on mariadb-10.2.7
| -rw-r--r-- | 20018_all_mariadb-10.2.7-without-clientlibs-tools.patch | 20 |
1 files changed, 17 insertions, 3 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 9ff438d..adcf12f 100644 --- a/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch @@ -115,6 +115,21 @@ 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 @@ -139,6 +154,5 @@ diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) 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-18 20:36:19.699737005 -0400 -+++ b/libmariadb/libmariadb/CMakeLists.txt 2017-07-18 20:49:58.260498557 -0400 + + |