Skip to content
GitLab
Commit 33353b1f authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Remove Taocrypt workaround fixed upstream long since #627208

parent 62a3df70
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 33353b1f
...@@ -17,6 +17,7 @@ mariadb-10.0 (10.0.23-2) UNRELEASED; urgency=low ...@@ -17,6 +17,7 @@ mariadb-10.0 (10.0.23-2) UNRELEASED; urgency=low
* Update slow_query_log_file configuration syntax to match upstream's. Also * Update slow_query_log_file configuration syntax to match upstream's. Also
fixes #677222 in MariaDB packages. fixes #677222 in MariaDB packages.
* Rename and install Apport hook correctly * Rename and install Apport hook correctly
* Remove Taocrypt workaround fixed upstream long since #627208
-- Otto Kekäläinen <otto@seravo.fi> Mon, 28 Dec 2015 09:51:36 +0200 -- Otto Kekäläinen <otto@seravo.fi> Mon, 28 Dec 2015 09:51:36 +0200
......
debian/rules
View file @ 33353b1f
...@@ -35,10 +35,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ...@@ -35,10 +35,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j $(NUMJOBS) MAKEFLAGS += -j $(NUMJOBS)
endif endif
ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
endif
# Ignore test suite exit code on unstable platforms # Ignore test suite exit code on unstable platforms
ifneq (,$(filter $(ARCH), mips mipsel)) ifneq (,$(filter $(ARCH), mips mipsel))
TESTSUITE_FAIL_CMD:=true TESTSUITE_FAIL_CMD:=true
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment