diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index fa24079f9..4714ba7b3 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb PKG_VERSION:=11.4.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source @@ -372,6 +372,7 @@ CMAKE_OPTIONS += \ -DWITH_INNODB_LZO=OFF \ -DWITH_INNODB_SNAPPY=OFF \ -DWITH_JEMALLOC=OFF \ + -DWITH_LIBAIO=$(if $(CONFIG_KERNEL_IO_URING),OFF,ON) \ -DWITH_LIBARCHIVE=OFF \ -DWITH_LIBFMT=system \ -DWITH_LIBWRAP=OFF \ @@ -381,6 +382,7 @@ CMAKE_OPTIONS += \ -DWITH_SAFEMALLOC=OFF \ -DWITH_SSL=system \ -DWITH_SYSTEMD=no \ + -DWITH_URING=$(if $(CONFIG_KERNEL_IO_URING),ON,OFF) \ -DWITH_VALGRIND=OFF \ -DWITH_ZLIB=system diff --git a/utils/mariadb/patches/110-remove-uring-libaio-checks.patch b/utils/mariadb/patches/110-remove-uring-libaio-checks.patch new file mode 100644 index 000000000..214d92ef2 --- /dev/null +++ b/utils/mariadb/patches/110-remove-uring-libaio-checks.patch @@ -0,0 +1,13 @@ +--- a/tpool/CMakeLists.txt ++++ b/tpool/CMakeLists.txt +@@ -9,7 +9,9 @@ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux + ELSEIF(WITH_LIBAIO) + SET(LIBAIO_REQUIRED REQUIRED) + ENDIF() +- FIND_PACKAGE(URING QUIET ${URING_REQUIRED}) ++ IF(WITH_URING) ++ FIND_PACKAGE(URING QUIET ${URING_REQUIRED}) ++ ENDIF() + IF(URING_FOUND) + SET(URING_FOUND ${URING_FOUND} PARENT_SCOPE) + SET(TPOOL_DEFINES "-DHAVE_URING" PARENT_SCOPE)