From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8408413832E for ; Thu, 21 Jul 2016 15:26:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 074FC21C03A; Thu, 21 Jul 2016 15:26:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8876321C03A for ; Thu, 21 Jul 2016 15:26:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07B4B340E41 for ; Thu, 21 Jul 2016 15:26:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD9987DF for ; Thu, 21 Jul 2016 15:26:20 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1469105902.63743a3eeb350f20f73d2e44a24bb2b9155a0deb.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20006_all_cmake_elib-mariadb-10.1.16.patch 20018_all_mariadb-10.1.16-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 63743a3eeb350f20f73d2e44a24bb2b9155a0deb X-VCS-Branch: master Date: Thu, 21 Jul 2016 15:26:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4dc640b0-c7b8-4002-8a3d-d907c0c7de0a X-Archives-Hash: 0841888ff0550fc98c08df1b5d33aeb5 commit: 63743a3eeb350f20f73d2e44a24bb2b9155a0deb Author: Brian Evans gentoo org> AuthorDate: Thu Jul 21 12:58:22 2016 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Jul 21 12:58:22 2016 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=63743a3e Respin patches for 10.1.16 20006_all_cmake_elib-mariadb-10.1.16.patch | 187 +++++++++++++++++++++ ..._mariadb-10.1.16-without-clientlibs-tools.patch | 114 +++++++++++++ 2 files changed, 301 insertions(+) diff --git a/20006_all_cmake_elib-mariadb-10.1.16.patch b/20006_all_cmake_elib-mariadb-10.1.16.patch new file mode 100644 index 0000000..6087a6b --- /dev/null +++ b/20006_all_cmake_elib-mariadb-10.1.16.patch @@ -0,0 +1,187 @@ +diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake +--- mysql-old/cmake/install_layout.cmake 2014-01-18 22:28:40.431273470 -0100 ++++ mysql/cmake/install_layout.cmake 2014-01-18 22:40:48.646301163 -0100 +@@ -44,7 +44,8 @@ + # - INSTALL_SYSCONFDIR (my.cnf config file. Usually /etc or nothing) + # - INSTALL_SYSCONF2DIR (additional config files, e.g. /etc/mysql/conf.d) + # +-# - INSTALL_LIBDIR (directory with client end embedded libraries) ++# - INSTALL_LIBDIR (directory with client libraries) ++# - INSTALL_ELIBDIR (directory with embedded libraries) + # - INSTALL_PLUGINDIR (directory for plugins) + # + # - INSTALL_INCLUDEDIR (directory for MySQL headers) +@@ -120,6 +121,7 @@ + SET(INSTALL_SCRIPTDIR_STANDALONE "scripts") + # + SET(INSTALL_LIBDIR_STANDALONE "lib") ++SET(INSTALL_ELIBDIR_STANDALONE "lib") + SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin") + # + SET(INSTALL_INCLUDEDIR_STANDALONE "include/mysql") +@@ -150,9 +152,11 @@ + # + IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") + SET(INSTALL_LIBDIR_RPM "lib64") ++ SET(INSTALL_ELIBDIR_RPM "lib64") + SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin") + ELSE() + SET(INSTALL_LIBDIR_RPM "lib") ++ SET(INSTALL_ELIBDIR_RPM "lib") + SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin") + ENDIF() + # +@@ -183,6 +187,7 @@ + SET(INSTALL_SYSCONF2DIR_DEB "/etc/mysql/conf.d") + # + SET(INSTALL_LIBDIR_DEB "lib") ++SET(INSTALL_ELIBDIR_DEB "lib") + SET(INSTALL_PLUGINDIR_DEB "lib/mysql/plugin") + # + SET(INSTALL_INCLUDEDIR_DEB "include/mysql") +@@ -210,6 +215,7 @@ + SET(INSTALL_SCRIPTDIR_SVR4 "scripts") + # + SET(INSTALL_LIBDIR_SVR4 "lib") ++SET(INSTALL_ELIBDIR_SVR4 "lib") + SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin") + # + SET(INSTALL_INCLUDEDIR_SVR4 "include/mysql") +@@ -241,7 +247,7 @@ + # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR + # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE + # layout is chosen) +-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2 ++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2 + INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA UNIX_ADDR + SYSTEMD_UNIT) + SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}} +diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake +--- mysql-old/cmake/libutils.cmake 2014-01-18 22:28:40.430273470 -0100 ++++ mysql/cmake/libutils.cmake 2014-01-18 22:28:52.801273941 -0100 +@@ -211,10 +211,11 @@ + # [linklib1 .... linklibN] + # [EXPORTS exported_func1 .... exportedFuncN] + # [OUTPUT_NAME output_name] ++# [OUTPUT_DIR output_dir] + #) + MACRO(MERGE_LIBRARIES) + MYSQL_PARSE_ARGUMENTS(ARG +- "EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION" ++ "EXPORTS;OUTPUT_NAME;COMPONENT;VERSION;SOVERSION;OUTPUT_DIR" + "STATIC;SHARED;MODULE;NOINSTALL" + ${ARGN} + ) +@@ -274,7 +275,11 @@ + IF(ARG_COMPONENT) + SET(COMP COMPONENT ${ARG_COMPONENT}) + ENDIF() +- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ IF(ARG_OUTPUT_DIR) ++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${ARG_OUTPUT_DIR}" ${COMP}) ++ ELSE() ++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ ENDIF() + ENDIF() + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") + IF(ARG_SHARED AND LINK_FLAG_NO_UNDEFINED) +diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt +--- mysql-old/libmysql/CMakeLists.txt 2014-01-18 22:28:40.429273470 -0100 ++++ mysql/libmysql/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 +@@ -327,9 +327,14 @@ + + SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL}) + ++SET(INSTALL_STATIC_LIBS "") ++IF(NOT ENABLE_STATIC_LIBS) ++ SET(INSTALL_STATIC_LIBS "NOINSTALL") ++ENDIF() ++ + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. +-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) ++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS}) + + # Visual Studio users need debug static library for debug projects + IF(MSVC) +@@ -350,7 +355,9 @@ + SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) + ENDIF() + ENDMACRO() +- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ++ IF(ENABLE_STATIC_LIBS) ++ INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ++ ENDIF() + ENDIF() + + IF(NOT DISABLE_SHARED) +diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt +--- mysql-old/libmysqld/CMakeLists.txt 2014-01-18 22:28:40.090273457 -0100 ++++ mysql/libmysqld/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 +@@ -133,8 +133,13 @@ + ENDIF() + ENDFOREACH() + ++SET(INSTALL_STATIC_LIBS "") ++IF(NOT ENABLE_STATIC_LIBS) ++ SET(INSTALL_STATIC_LIBS "NOINSTALL") ++ENDIF() ++ + MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} +- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER}) ++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER} OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS}) + + INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT ${COMPONENT_MYSQLSERVER}) + +@@ -144,7 +149,7 @@ + ENDIF() + + IF(UNIX) +- INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR} RENAME ++ INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_ELIBDIR} RENAME + ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug) + ENDIF() + +@@ -163,7 +167,7 @@ + + IF(NOT DISABLE_SHARED) + MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${EMBEDDED_API} +- COMPONENT ${COMPONENT_LIBMYSQLD}) ++ COMPONENT ${COMPONENT_LIBMYSQLD} OUTPUT_DIR ${INSTALL_ELIBDIR}) + IF(UNIX) + # Name the shared library, handle versioning (provides same api as client + # library hence the same version) +diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt +--- mysql-old/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400 ++++ mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400 +@@ -236,6 +236,7 @@ + SET(pkglibdir ${prefix}/${INSTALL_LIBDIR}) + SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) + SET(localstatedir ${MYSQL_DATADIR}) ++SET(elibdir ${prefix}/${INSTALL_ELIBDIR}) + + SET(RPATH_OPTION "") + IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") +diff -aurN mysql.orig/scripts/mysql_config.sh mysql/scripts/mysql_config.sh +--- mysql.orig/scripts/mysql_config.sh 2014-10-15 18:53:51.000000000 -0400 ++++ mysql/scripts/mysql_config.sh 2014-10-22 16:17:02.590868620 -0400 +@@ -92,6 +92,10 @@ + plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` + fix_path plugindir $plugindir_rel @libsubdir@/mysql/plugin @libsubdir@/plugin + ++elibdir='@elibdir@' ++elibdir_rel=`echo $elibdir | sed -e "s;^$basedir/;;"` ++fix_path elibdir $elibdir_rel @libsubdir@/mysql @libsubdir@ ++ + pkgincludedir='@pkgincludedir@' + fix_path pkgincludedir include/mysql + +@@ -106,7 +110,7 @@ + + # Create options + libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" +-embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" ++embedded_libs="-L$elibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" + + include="-I$pkgincludedir" + if [ "$basedir" != "/usr" ]; then diff --git a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch new file mode 100644 index 0000000..db1988d --- /dev/null +++ b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch @@ -0,0 +1,114 @@ +diff -aurN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400 ++++ b/CMakeLists.txt 2015-06-24 10:34:17.314169100 -0400 +@@ -354,8 +354,6 @@ + MYSQL_CHECK_ZLIB_WITH_COMPRESS() + # Add bundled yassl/taocrypt or system openssl. + MYSQL_CHECK_SSL() +-# Add readline or libedit. +-MYSQL_CHECK_READLINE() + + SET(MALLOC_LIBRARY "system") + CHECK_JEMALLOC() +@@ -394,22 +392,33 @@ + CONFIGURE_PLUGINS() + ENDIF() + +-ADD_SUBDIRECTORY(include) ++IF(NOT WITHOUT_CLIENTLIBS) ++ ADD_SUBDIRECTORY(include) ++ENDIF(NOT WITHOUT_CLIENTLIBS) ++ + ADD_SUBDIRECTORY(dbug) + ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) + ADD_SUBDIRECTORY(mysys) + ADD_SUBDIRECTORY(mysys_ssl) + ADD_SUBDIRECTORY(libmysql) +-ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(extra) + ADD_SUBDIRECTORY(libservices) + ADD_SUBDIRECTORY(sql/share) + ++IF(NOT WITHOUT_TOOLS) ++ # Add readline or libedit. ++ MYSQL_CHECK_READLINE() ++ ADD_SUBDIRECTORY(client) ++ENDIF(NOT WITHOUT_TOOLS) ++ + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) +- IF(WITH_EMBEDDED_SERVER) ++ IF(WITH_EMBEDDED_SERVER) ++ IF(WITHOUT_TOOLS) ++ MYSQL_CHECK_READLINE() ++ ENDIF(WITHOUT_TOOLS) + ADD_SUBDIRECTORY(libmysqld) + ADD_SUBDIRECTORY(libmysqld/examples) + ENDIF(WITH_EMBEDDED_SERVER) +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 @@ + 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) ++ENDIF(NOT WITHOUT_CLIENTLIBS) + + IF(UNIX) + MYSQL_ADD_EXECUTABLE(resolveip resolveip.c) +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 +@@ -327,6 +327,5 @@ + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config + mysql_setpermission + mysql_secure_installation +@@ -341,6 +340,12 @@ + ${WSREP_BINARIES} + ${SYSTEMD_SCRIPTS} + ) ++ IF(NOT WITHOUT_CLIENTLIBS) ++ SET(BIN_SCRIPTS ++ ${BIN_SCRIPTS} ++ mysql_config ++ ) ++ ENDIF(NOT WITHOUT_CLIENTLIBS) + FOREACH(file ${BIN_SCRIPTS}) + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh +diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +--- a/libmysql/CMakeLists.txt 2015-06-24 12:32:11.606169100 -0400 ++++ b/libmysql/CMakeLists.txt 2015-06-24 13:44:53.857169100 -0400 +@@ -440,12 +440,12 @@ + SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) + ENDIF() + ENDMACRO() +- IF(ENABLE_STATIC_LIBS) ++ IF(ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS) + INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) + ENDIF() + ENDIF() + +-IF(NOT DISABLE_SHARED) ++IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} + COMPONENT SharedLibraries)