summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-03-11 03:39:00 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-03-11 03:39:00 +0000
commitea44a92e411125d951484fbddd2f96f3b48ac5f0 (patch)
treef3a13b60eec6f588204e40f8c4dbe6b3456ba1b7
parentUpdating vcs fields. (diff)
downloadmariadb-10.3-ea44a92e411125d951484fbddd2f96f3b48ac5f0.tar.xz
mariadb-10.3-ea44a92e411125d951484fbddd2f96f3b48ac5f0.zip
Building with openssl instead of yassl/gnutls.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules3
2 files changed, 2 insertions, 5 deletions
diff --git a/debian/control b/debian/control
index 9a2588c5..da8ab0d9 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Build-Depends: bison,
libarchive-dev,
libboost-dev,
libcrack2-dev (>= 2.9.0),
- libgnutls28-dev (>= 3.3.24),
libjemalloc-dev [linux-any],
libjudy-dev,
libkrb5-dev,
@@ -29,6 +28,7 @@ Build-Depends: bison,
libreadline-gplv2-dev,
libreadline-gplv2-dev:native,
libsnappy-dev,
+ libssl-dev,
libsystemd-dev [linux-any],
libxml2-dev,
libzstd-dev (>= 1.3.3),
@@ -49,7 +49,7 @@ Package: libmariadb-dev
Architecture: any
Section: libdevel
Depends: libmariadb3 (= ${binary:Version}),
- libgnutls28-dev,
+ libssl-dev,
zlib1g-dev,
${misc:Depends},
${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index 6ae358bd..eb809e2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,8 +89,6 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
dh_auto_build --builddirectory=builddir-native -- import_executables
endif
- # Remove -DWITH_SSL=bundle if you want to use system OpenSSL, otherwise
- # the server will use YaSSL and Connector/C will use GnuTLS
mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \
sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \
CC=${CC} \
@@ -107,7 +105,6 @@ endif
-DINSTALL_PLUGINDIR=lib/$(DEB_HOST_MULTIARCH)/mariadb19/plugin \
-DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test \
-DPLUGIN_AUTH_SOCKET=STATIC \
- -DWITH_SSL=bundled \
-DPLUGIN_AWS_KEY_MANAGEMENT=NO \
-DWITH_INNODB_SNAPPY=ON \
-DDEB=$(DEB_VENDOR) ..'