OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mariadb: fix liburing dependency 

CMake is way too opertunistic. Avoid the dependency by manually handling
it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2025-04-29 15:21:32 -07:00 committed by Tianling Shen
parent 8518af47e6
commit 9d12a9618a
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/mariadb/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mariadb PKG_NAME:=mariadb
PKG_VERSION:=11.4.4 PKG_VERSION:=11.4.4
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source
@ -372,6 +372,7 @@ CMAKE_OPTIONS += \
-DWITH_INNODB_LZO=OFF \ -DWITH_INNODB_LZO=OFF \
-DWITH_INNODB_SNAPPY=OFF \ -DWITH_INNODB_SNAPPY=OFF \
-DWITH_JEMALLOC=OFF \ -DWITH_JEMALLOC=OFF \
-DWITH_LIBAIO=$(if $(CONFIG_KERNEL_IO_URING),OFF,ON) \
-DWITH_LIBARCHIVE=OFF \ -DWITH_LIBARCHIVE=OFF \
-DWITH_LIBFMT=system \ -DWITH_LIBFMT=system \
-DWITH_LIBWRAP=OFF \ -DWITH_LIBWRAP=OFF \
@ -381,6 +382,7 @@ CMAKE_OPTIONS += \
-DWITH_SAFEMALLOC=OFF \ -DWITH_SAFEMALLOC=OFF \
-DWITH_SSL=system \ -DWITH_SSL=system \
-DWITH_SYSTEMD=no \ -DWITH_SYSTEMD=no \
-DWITH_URING=$(if $(CONFIG_KERNEL_IO_URING),ON,OFF) \
-DWITH_VALGRIND=OFF \ -DWITH_VALGRIND=OFF \
-DWITH_ZLIB=system -DWITH_ZLIB=system

13
utils/mariadb/patches/110-remove-uring-libaio-checks.patch Normal file
View File

@ -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)