Date: Sat, 5 Mar 2016 13:57:10 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410182 - in head/databases/mariadb101-server: . files Message-ID: <201603051357.u25DvA5b033697@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Mar 5 13:57:10 2016 New Revision: 410182 URL: https://svnweb.freebsd.org/changeset/ports/410182 Log: databases/mariadb101-server: Fix i386, GSSAPI & Engine build issues - Add USES=compiler:c++11-lib - Use both deprecated -DPLUGIN_${engine} and new -DWITHOUT_${engine} to disable engines (fixes engines not being disabled) - Add IGNORE for GSSAPI_BASE on FreeBSD < 10, version is too old - Add IGNORE for TokuDB, upstream not supported on 32-bit platforms - Add IGNORE on i386, currently broken with clang [1] [1] https://jira.mariadb.org/browse/MDEV-9627 Reviewer by: koobs (mentor) Approved by: koobs (mentor) Differential Revision: D5478 Modified: head/databases/mariadb101-server/Makefile head/databases/mariadb101-server/files/patch-plugin_auth__gssapi_gssapi__server.cc head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_buildheader_CMakeLists.txt head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Sat Mar 5 13:32:02 2016 (r410181) +++ head/databases/mariadb101-server/Makefile Sat Mar 5 13:57:10 2016 (r410182) @@ -22,13 +22,13 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb101-client -USES= bison:build cmake cpe execinfo shebangfix +USES= bison:build cmake compiler:c++11-lib cpe execinfo shebangfix USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source OPTIONS_DEFINE= FASTMTX -OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_DEFAULT= GSSAPI_BASE @@ -40,6 +40,7 @@ OPTIONS_DEFINE+= MAXKEY OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER OPTIONS_GROUP= ENGINES OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB +OPTIONS_EXCLUDE_i386= TOKUDB ENGINES_DESC= Optional MariaDB storage engines INNOBASE_DESC= Build InnoDB engine next to XtraDB @@ -108,7 +109,8 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES} -${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1 +${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ + -DWITHOUT_${ENGINE}=1 .endfor MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h @@ -119,6 +121,10 @@ OQGRAPH_LIB_DEPENDS= libboost_system.so: OQGRAPH_USE= gcc=yes TOKUDB_LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ + https://mariadb.atlassian.net/browse/MDEV-9627 + post-install: # Remove programs to avoid conflict with mariadb101-client # These are "client" components, so there should be a switch that @@ -133,10 +139,8 @@ post-install: ${RM} ${STAGEDIR}/${PREFIX}/bin/maria_add_gis_sp.sql .endif # defined(CLIENT_ONLY) -.include <bsd.port.options.mk> - -.if defined(WITH_OPENSSL_PORT) && ${PORT_OPTIONS:MGSSAPI_BASE} -IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system +.if defined(WITH_OPENSSL_PORT) +GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .include <bsd.port.pre.mk> @@ -149,6 +153,9 @@ CMAKE_ARGS+= -DWITHOUT_TOKUDB CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" +.if ${PORT_OPTIONS:MGSSAPI_BASE} +IGNORE= requires a Kerberos implementation from ports on FreeBSD < 10. Select GSSAPI_HEIMDAL or GSSAPI_MIT option +.endif .endif post-patch: Modified: head/databases/mariadb101-server/files/patch-plugin_auth__gssapi_gssapi__server.cc ============================================================================== --- head/databases/mariadb101-server/files/patch-plugin_auth__gssapi_gssapi__server.cc Sat Mar 5 13:32:02 2016 (r410181) +++ head/databases/mariadb101-server/files/patch-plugin_auth__gssapi_gssapi__server.cc Sat Mar 5 13:57:10 2016 (r410182) @@ -1,15 +1,16 @@ From 3d794d0ee8e0a5a7dfbd3b7de056c0a3ccb9aa81 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub <wlad@mariadb.com> + Date: Wed, 6 Jan 2016 09:15:19 +0100 Subject: [PATCH] MDEV9494 Fix build for Heimdal Kerberos - --- + plugin/auth_gssapi/gssapi_server.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/auth_gssapi/gssapi_server.cc b/plugin/auth_gssapi/gssapi_server.cc index d325b2a..ed042a0 100644 ---- plugin/auth_gssapi/gssapi_server.cc.orig +--- plugin/auth_gssapi/gssapi_server.cc.orig 2016-01-28 12:12:51 UTC +++ plugin/auth_gssapi/gssapi_server.cc @@ -58,7 +58,7 @@ static char* get_default_principal_name() } Modified: head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_buildheader_CMakeLists.txt ============================================================================== --- head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_buildheader_CMakeLists.txt Sat Mar 5 13:32:02 2016 (r410181) +++ head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_buildheader_CMakeLists.txt Sat Mar 5 13:57:10 2016 (r410182) @@ -1,7 +1,15 @@ -Fix build failure due to Linuxisms (bash) +https://github.com/MariaDB/server/pull/157 ---- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig 2015-12-23 16:33:32.000000000 +0100 -+++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt 2016-01-03 15:09:21.941678309 +0100 +MDEV-9657 - Use /bin/sh #157 + +Sp1l commented Feb 27, 2016 + +Remove Linuxism. + +Works fine with a POSIX-compat shell + +--- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig 2016-01-28 12:12:55 UTC ++++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt @@ -1,6 +1,6 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "") Modified: head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake ============================================================================== --- head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Sat Mar 5 13:32:02 2016 (r410181) +++ head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Sat Mar 5 13:57:10 2016 (r410182) @@ -1,5 +1,7 @@ ---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2015-12-23 16:33:32.000000000 +0100 -+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake 2016-01-10 22:34:14.059204126 +0100 +Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports + +--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2016-01-28 12:12:55 UTC ++++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake @@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) endif () endif ()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603051357.u25DvA5b033697>