From a780e5e36a3ddafc6c22a1b1472529365cc2ae8b Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 16 Apr 2018 10:51:08 +0200 Subject: mariadb: version bump 10.1.23 -> 10.1.32 Needed to build with gcc 7.x Signed-off-by: Michael Olbrich --- rules/host-mariadb.in | 2 -- rules/host-mariadb.make | 39 +++++++++++++++++++++++---------------- rules/mariadb.make | 21 +++++++++++---------- 3 files changed, 34 insertions(+), 28 deletions(-) (limited to 'rules') diff --git a/rules/host-mariadb.in b/rules/host-mariadb.in index b0bfdeac1..38a1bdd70 100644 --- a/rules/host-mariadb.in +++ b/rules/host-mariadb.in @@ -3,9 +3,7 @@ config HOST_MARIADB tristate default ALLYES - select HOST_LIBAIO select HOST_NCURSES select HOST_CMAKE - select HOST_ZLIB help Required host part of the MariaDB build system diff --git a/rules/host-mariadb.make b/rules/host-mariadb.make index 4b6babad6..ab1503a4e 100644 --- a/rules/host-mariadb.make +++ b/rules/host-mariadb.make @@ -20,32 +20,35 @@ HOST_PACKAGES-$(PTXCONF_HOST_MARIADB) += host-mariadb # # cmake # +# FEATURE_SET=xsmall disables all plugins +# PLUGIN_MROONGA is enabled because otherwise cmake fails for mariadb 10.1.32 HOST_MARIADB_CONF_TOOL := cmake -# DISABLE_SHARED disables dynamic plugins, disable plugins that default -# to "static" explicitly HOST_MARIADB_CONF_OPT := \ $(HOST_CMAKE_OPT) \ -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DBUILD_CONFIG=mysql_release \ + -DIGNORE_AIO_CHECK=ON \ -DSTACK_DIRECTION=1 \ -DHAVE_LLVM_LIBCPP_EXITCODE=no \ - -DHAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE_EXITCODE=no \ + -DCOMMUNITY_BUILD=ON \ -DCONNECT_WITH_JDBC=OFF \ -DCONNECT_WITH_LIBXML2=OFF \ -DCONNECT_WITH_ODBC=OFF \ -DCONNECT_WITH_VCT=OFF \ -DCONNECT_WITH_XMAP=OFF \ -DCONNECT_WITH_ZIP=OFF \ - -DDISABLE_SHARED=ON \ + -DDISABLE_SHARED=OFF \ -DENABLED_LOCAL_INFILE=OFF \ -DENABLED_PROFILING=OFF \ -DENABLE_GCOV=OFF \ + -DFEATURE_SET=xsmall \ -DINSTALL_LAYOUT=STANDALONE \ - -DMRN_GROONGA_EMBED=OFF \ -DMYSQL_MAINTAINER_MODE=OFF \ -DNOT_FOR_DISTRIBUTION=OFF \ -DSECURITY_HARDENED=ON \ - -DUSE_ARIA_FOR_TMP_TABLES=OFF \ + -DUSE_ARIA_FOR_TMP_TABLES=ON \ -DUSE_GCOV=OFF \ + -DWITHOUT_SERVER=OFF \ -DWITH_ASAN=OFF \ -DWITH_EMBEDDED_SERVER=OFF \ -DWITH_EXTRA_CHARSETS=none \ @@ -55,27 +58,31 @@ HOST_MARIADB_CONF_OPT := \ -DWITH_INNODB_LZMA=OFF \ -DWITH_INNODB_LZO=OFF \ -DWITH_INNODB_SNAPPY=OFF \ - -DWITH_JEMALLOC=no \ + -DWITH_JEMALLOC=OFF \ -DWITH_LIBARCHIVE=OFF \ -DWITH_LIBWRAP=OFF \ + -DWITH_PCRE=OFF \ -DWITH_MARIABACKUP=OFF \ -DWITH_READLINE=OFF \ -DWITH_SAFEMALLOC=OFF \ - -DWITH_SYSTEMD=OFF \ + -DWITH_SSL=bundled \ + -DWITH_SYSTEMD=no \ -DWITH_UNIT_TESTS=OFF \ -DWITH_VALGRIND=OFF \ -DWITH_WSREP=OFF \ - -DWITH_ZLIB=system \ - -DWITH_SSL=NO \ - -DPLUGIN_ARIA=NO \ - -DPLUGIN_FEEDBACK=NO \ - -DPLUGIN_PARTITION=NO \ - -DPLUGIN_PERFSCHEMA=NO \ - -DPLUGIN_SEQUENCE=NO \ - -DPLUGIN_XTRADB=NO + -DWITH_ZLIB=bundled \ + -DPLUGIN_MROONGA:FORCE=DYNAMIC \ + -DLZ4_LIBS=undefined HOST_MARIADB_CXXFLAGS := -std=c++98 +HOST_MARIADB_MAKE_OPT := \ + comp_err \ + comp_sql \ + factorial \ + gen_lex_hash \ + gen_lex_token + # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- diff --git a/rules/mariadb.make b/rules/mariadb.make index 5322c3eeb..c235be3bb 100644 --- a/rules/mariadb.make +++ b/rules/mariadb.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MARIADB) += mariadb # # Paths and names # -MARIADB_VERSION := 10.1.23 -MARIADB_MD5 := 1a7392cc05c7c249acd4495022719ca8 +MARIADB_VERSION := 10.1.32 +MARIADB_MD5 := 389ce891cf00957748ba98b09f433c14 MARIADB := mariadb-$(MARIADB_VERSION) MARIADB_SUFFIX := tar.gz MARIADB_URL := https://downloads.mariadb.com/MariaDB/$(MARIADB)/source/$(MARIADB).$(MARIADB_SUFFIX) @@ -86,9 +86,9 @@ MARIADB_PLUGINS_ENABLE- += XTRADB # MARIADB_CONF_TOOL := cmake -# 10.1.23 does not build with CONNECT_WITH_ZIP=OFF MARIADB_CONF_OPT := \ $(CROSS_CMAKE_USR) \ + -DBUILD_CONFIG=mysql_release \ -DSTACK_DIRECTION=1 \ -DIMPORT_EXECUTABLES=$(PTXDIST_SYSROOT_HOST)/share/mariadb/import_executables.cmake \ -DHAVE_LLVM_LIBCPP_EXITCODE=no \ @@ -98,13 +98,13 @@ MARIADB_CONF_OPT := \ -DCONNECT_WITH_ODBC=OFF \ -DCONNECT_WITH_VCT=OFF \ -DCONNECT_WITH_XMAP=OFF \ - -DCONNECT_WITH_ZIP=ON \ + -DCONNECT_WITH_ZIP=OFF \ -DDISABLE_SHARED=OFF \ -DENABLED_LOCAL_INFILE=OFF \ -DENABLED_PROFILING=OFF \ -DENABLE_GCOV=OFF \ + -DFEATURE_SET=community \ -DINSTALL_LAYOUT=STANDALONE \ - -DMRN_GROONGA_EMBED=OFF \ -DMYSQL_DATADIR=/var/lib/mysql/data \ -DMYSQL_MAINTAINER_MODE=OFF \ -DNOT_FOR_DISTRIBUTION=OFF \ @@ -122,23 +122,24 @@ MARIADB_CONF_OPT := \ -DWITH_INNODB_LZMA=OFF \ -DWITH_INNODB_LZO=OFF \ -DWITH_INNODB_SNAPPY=OFF \ - -DWITH_JEMALLOC=no \ + -DWITH_JEMALLOC=OFF \ -DWITH_LIBARCHIVE=OFF \ -DWITH_LIBWRAP=OFF \ - -DWITH_MARIABACKUP=OFF \ -DWITH_PCRE=system \ + -DPCRE_STACK_SIZE_OK=1 \ + -DWITH_MARIABACKUP=OFF \ -DWITH_READLINE=OFF \ -DWITH_SAFEMALLOC=OFF \ - -DWITH_SYSTEMD=$(call ptx/onoff, PTXCONF_MARIADB_SYSTEMD) \ + -DWITH_SSL=system \ + -DWITH_SYSTEMD=$(call ptx/yesno, PTXCONF_MARIADB_SYSTEMD) \ -DWITH_UNIT_TESTS=OFF \ -DWITH_VALGRIND=OFF \ -DWITH_WSREP=OFF \ -DWITH_ZLIB=system \ - -DWITH_SSL=system \ -DSYSCONFDIR=/etc/mariadb \ -DCOMPILATION_COMMENT=PTXdist \ -DDEFAULT_CHARSET=latin1 \ - -DENABLE_DTRACE=OFF + -DLZ4_LIBS=undefined ifneq ($(strip $(MARIADB_PLUGINS_ENABLES-y)),) MARIADB_CONF_OPT += $(foreach plugin,$(MARIADB_PLUGINS_ENABLES-y),$(addprefix -DPLUGIN_,$(addsuffix =STATIC, $(plugin)))) -- cgit v1.2.3