summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2021-08-11 11:14:45 +1000
committerDaniel Black <daniel@mariadb.org>2021-08-13 09:23:43 +1000
commit30d33d85cbeb7111898607fa9273bd308199eff7 (patch)
tree4a3669cc85a304e8674c9d1c76cc7c37ed9a7322
parent070183cfc0d06254b1b4ce75be48bac9a8fa805b (diff)
downloadmariadb-git-30d33d85cbeb7111898607fa9273bd308199eff7.tar.gz
deb: s390x no WolfSSL workaround as upstream fixed in 4.6.0
https://github.com/wolfSSL/wolfssl/issues/2828 lists 4.6.0 a as the fixed version as we currently have 4.8.0. Since the time of the above issue, Debian has allowed OpenSSL linking.
-rwxr-xr-xdebian/rules8
1 files changed, 0 insertions, 8 deletions
diff --git a/debian/rules b/debian/rules
index 5e7da691b00..865784526be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,14 +52,6 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
endif
endif
-# Add extra flag to avoid WolfSSL code crashing the entire mariadbd on s390x. This
-# can be removed once upstream has made the code s390x compatible, see
-# https://jira.mariadb.org/browse/MDEV-21705 and
-# https://github.com/wolfSSL/wolfssl/issues/2828
-ifeq ($(DEB_HOST_ARCH),s390x)
- CFLAGS += -DWC_NO_CACHE_RESISTANT
-endif
-
# Add support for verbose builds
MAKEFLAGS += VERBOSE=1