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/host-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/host-mariadb.make')
| -rw-r--r-- | rules/host-mariadb.make | 39 |
1 files changed, 23 insertions, 16 deletions
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 # ---------------------------------------------------------------------------- |