revision-id: 91d506cf2d5c143f7eb74e776b1417cf2acaacd8 (mariadb-10.2.22-12-g91d506cf2d5) parent(s): 88b6dc4db5567951f9c0d0baa6e965d44a7130b1 431da59f1ce2b594ef465563bf18f670f07a1b32 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-02-19 16:47:45 +0100 message: Merge branch '10.1' into 10.2 CMakeLists.txt | 2 +- cmake/readline.cmake | 2 +- configure.cmake | 2 +- plugin/aws_key_management/CMakeLists.txt | 8 ++++++-- scripts/mysql_install_db.sh | 8 +++++--- 5 files changed, 14 insertions(+), 8 deletions(-) diff --cc plugin/aws_key_management/CMakeLists.txt index aa93fc3aa03,49f6b54a24c..e9e1b49d5f2 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@@ -17,8 -22,19 +17,10 @@@ MACRO(SKIP_AWS_PLUGIN msg ENDMACRO() SET(CMAKE_CXX_STANDARD 11) - + IF(NOT NOT_FOR_DISTRIBUTION) + SKIP_AWS_PLUGIN("AWS SDK has Apache 2.0 License which is not complatible with GPLv2. Set -DNOT_FOR_DISTRIBUTION=ON if you need this plugin") + ENDIF() -MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc DISABLED - COMPONENT aws-key-management) - -IF(NOT TARGET aws_key_management) - RETURN() -ELSE() - SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" PARENT_SCOPE) -ENDIF() - # This plugin needs recent C++ compilers (AWS C++ SDK header files are using C++11 features) SET(CXX11_FLAGS) SET(OLD_COMPILER_MSG "AWS SDK requires c++11 -capable compiler (minimal supported versions are g++ 4.8, clang 3.3, VS2103)") @@@ -163,8 -181,5 +165,10 @@@ IF(WIN32 ELSE() SET(AWS_CPP_SDK_DEPENDENCIES ${OPENSSL_LIBRARIES} ${CURL_LIBRARIES} ${UUID_LIBRARIES}) ENDIF() +MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc + LINK_LIBRARIES ${AWS_SDK_LIBS} ${AWS_CPP_SDK_DEPENDENCIES} + COMPONENT aws-key-management) - -TARGET_LINK_LIBRARIES(aws_key_management ${AWS_SDK_LIBS} ${AWS_CPP_SDK_DEPENDENCIES}) ++IF (TARGET aws_key_management) ++ SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" PARENT_SCOPE) ++ENDIF() diff --cc scripts/mysql_install_db.sh index 681b73dfc9f,5fa2c4c0e04..8bad8c4000b --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@@ -342,17 -342,15 +344,17 @@@ the cannot_find_file fill_help_tables.sql @pkgdata_locations@ exit 1 fi + plugindir=`find_in_dirs --dir auth_socket.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin` # relative from where the script was run for a relocatable install - elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld" + elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld" then basedir="$dirname0" - bindir="$basedir/@INSTALL_SBINDIR@" + bindir="$basedir/@INSTALL_BINDIR@" resolveip="$bindir/resolveip" - mysqld="$basedir/@INSTALL_SBINDIR@/mysqld" + mysqld="$rel_mysqld" srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" + plugindir="$basedir/@INSTALL_PLUGINDIR@" else basedir="@prefix@" bindir="@bindir@"