summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-11-18 20:28:21 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-11-19 20:42:42 +0100
commite8e842a200c4b5caa37e5cbd98608013f9aedb4e (patch)
tree962505139af4a587c4646c50769468ef73608c20
parent04c5ca5b27062e58137db4f2e04b207c222f6dd5 (diff)
downloadptxdist-e8e842a200c4b5caa37e5cbd98608013f9aedb4e.tar.gz
ptxdist-e8e842a200c4b5caa37e5cbd98608013f9aedb4e.tar.xz
mariadb: switch to bundled ssl
Prepare for OpenSSL update: The current MariaDB version does not support OpenSSL 1.1.x. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/mariadb.in1
-rw-r--r--rules/mariadb.make2
2 files changed, 1 insertions, 2 deletions
diff --git a/rules/mariadb.in b/rules/mariadb.in
index f6241cf43..b2127ea34 100644
--- a/rules/mariadb.in
+++ b/rules/mariadb.in
@@ -14,7 +14,6 @@ config MARIADB
select LIBAIO
select LIBPCRE
select NCURSES
- select OPENSSL
select SYSTEMD if MARIADB_SYSTEMD
select ZLIB
prompt "mariadb" if ALLYES
diff --git a/rules/mariadb.make b/rules/mariadb.make
index 4f17d5b79..f93b3857a 100644
--- a/rules/mariadb.make
+++ b/rules/mariadb.make
@@ -131,7 +131,7 @@ MARIADB_CONF_OPT := \
-DWITH_MARIABACKUP=OFF \
-DWITH_READLINE=OFF \
-DWITH_SAFEMALLOC=OFF \
- -DWITH_SSL=system \
+ -DWITH_SSL=bundled \
-DWITH_SYSTEMD=$(call ptx/yesno, PTXCONF_MARIADB_SYSTEMD) \
-DWITH_UNIT_TESTS=OFF \
-DWITH_VALGRIND=OFF \