Merge pull request #17064 from cotequeiroz/mariadb

mariadb, liburing: fix liburing dependency failure (use liburing if kernel supports it)
This commit is contained in:
Eneas U de Queiroz 2021-11-25 20:52:26 -03:00 committed by GitHub
commit 9335b406bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View File

@ -22,6 +22,7 @@ define Package/liburing
CATEGORY:=Libraries
TITLE:=io_uring library
URL:=https://git.kernel.dk/cgit/liburing
DEPENDS:=@KERNEL_IO_URING
endef
define Package/liburing/description

View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mariadb
PKG_VERSION:=10.6.4
PKG_RELEASE:=1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source
@ -36,6 +36,7 @@ MARIADB_SOCKET=/var/run/mysqld/mysqld.sock
MARIADB_DISABLE_ENGINES := \
cassandra \
columnstore \
example \
mroonga \
oqgraph \
@ -81,6 +82,7 @@ MARIADB_SERVER_PLUGINS := \
PKG_CONFIG_DEPENDS := \
$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-server-plugin-%,$(subst _,-,$(MARIADB_SERVER_PLUGINS))) \
CONFIG_KERNEL_IO_URING \
CONFIG_PACKAGE_mariadb-server
plugin-auth_ed25519 := PLUGIN_AUTH_ED25519
@ -283,7 +285,8 @@ define Package/mariadb-server-base
$(call Package/mariadb/Default)
DEPENDS:=mariadb-common \
$(MARIADB_COMMON_DEPENDS) \
+libaio \
+!KERNEL_IO_URING:libaio \
+KERNEL_IO_URING:liburing \
+liblzma \
+libpcre2 \
+resolveip