Browse Source

mariadb: use liburing if kernel supports it

liburing is preferred over libaio.  So, if liburing has already been
built, mariadb will use it, instead of libaio, failing with a missed
dependency.  If it is not found, then libaio is used.

Since it depends on the kernel being built with io_uring support, and it
defaults to y unless SMALL_FLASH=y, then we should allow libaio as
fallback, checking the CONFIG_KERNEL_IO_URING symbol.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
lilik-openwrt-22.03
Eneas U de Queiroz 3 years ago
parent
commit
a3cec3e410
No known key found for this signature in database GPG Key ID: 5FB9FAF260B80AEA
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      utils/mariadb/Makefile

+ 3
- 1
utils/mariadb/Makefile View File

@ -82,6 +82,7 @@ MARIADB_SERVER_PLUGINS := \
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS := \
$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-server-plugin-%,$(subst _,-,$(MARIADB_SERVER_PLUGINS))) \ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-server-plugin-%,$(subst _,-,$(MARIADB_SERVER_PLUGINS))) \
CONFIG_KERNEL_IO_URING \
CONFIG_PACKAGE_mariadb-server CONFIG_PACKAGE_mariadb-server
plugin-auth_ed25519 := PLUGIN_AUTH_ED25519 plugin-auth_ed25519 := PLUGIN_AUTH_ED25519
@ -284,7 +285,8 @@ define Package/mariadb-server-base
$(call Package/mariadb/Default) $(call Package/mariadb/Default)
DEPENDS:=mariadb-common \ DEPENDS:=mariadb-common \
$(MARIADB_COMMON_DEPENDS) \ $(MARIADB_COMMON_DEPENDS) \
+libaio \
+!KERNEL_IO_URING:libaio \
+KERNEL_IO_URING:liburing \
+liblzma \ +liblzma \
+libpcre2 \ +libpcre2 \
+resolveip +resolveip


Loading…
Cancel
Save