Control: tags -1 + patch

This debdiff suggest making the rocksdb plugin linux only.

        Mattias

diff -Nru mariadb-10.3-10.3.18/debian/rules mariadb-10.3-10.3.18/debian/rules
--- mariadb-10.3-10.3.18/debian/rules	2019-08-06 02:56:47.000000000 +0000
+++ mariadb-10.3-10.3.18/debian/rules	2019-09-12 12:51:04.000000000 +0000
@@ -47,6 +47,10 @@
     CMAKEFLAGS += -DWITHOUT_ROCKSDB=true
 endif
 
+ifneq (linux,$(DEB_HOST_ARCH_OS))
+    CMAKEFLAGS += -DWITHOUT_ROCKSDB=true
+endif
+
 # Skip TokuDB if arch is not amd64 (also disable for kfreebsd-amd64 as it FTBFS)
 # Skipped on the x32 ABI too; untested, but unlikely to work given i386 is not
 # supported.
diff -Nru mariadb-10.3-10.3.18/debian/tests/smoke mariadb-10.3-10.3.18/debian/tests/smoke
--- mariadb-10.3-10.3.18/debian/tests/smoke	2019-08-06 02:56:47.000000000 +0000
+++ mariadb-10.3-10.3.18/debian/tests/smoke	2019-09-12 12:51:04.000000000 +0000
@@ -75,6 +75,7 @@
 # Check whether RocksDB should be installed or not.
 plugin=mariadb-plugin-rocksdb
 if [ "`dpkg-architecture -qDEB_HOST_ARCH_BITS`" != 32 ] &&
+   [ "`dpkg-architecture -qDEB_HOST_ARCH_OS`" = linux ] &&
    [ "`dpkg-architecture -qDEB_HOST_ARCH_ENDIAN`" = little ]; then
   dpkg-query -W $plugin
 

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to