diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-16 10:51:08 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-16 20:54:31 +0200 |
| commit | a780e5e36a3ddafc6c22a1b1472529365cc2ae8b (patch) | |
| tree | f2107500c6ba305f2f1c2e090c5e65cdc7b96b62 /rules/mariadb.make | |
| parent | 7aa693475c1de86436ed44051286577503dd1ffa (diff) | |
| download | ptxdist-a780e5e36a3ddafc6c22a1b1472529365cc2ae8b.tar.gz ptxdist-a780e5e36a3ddafc6c22a1b1472529365cc2ae8b.tar.xz | |
mariadb: version bump 10.1.23 -> 10.1.32
Needed to build with gcc 7.x
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/mariadb.make')
| -rw-r--r-- | rules/mariadb.make | 21 |
1 files changed, 11 insertions, 10 deletions
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)))) |