Browse Source

mariadb: fix libmariadb depends

The shared library does not depend on libatomic nor libstdcpp anymore.
This is very good news for the users of said lib.

This commit updates the depends accordingly.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
lilik-openwrt-22.03
Sebastian Kemper 6 years ago
parent
commit
f4fda3f7f6
1 changed files with 7 additions and 4 deletions
  1. +7
    -4
      utils/mariadb/Makefile

+ 7
- 4
utils/mariadb/Makefile View File

@ -171,11 +171,14 @@ include $(INCLUDE_DIR)/nls.mk
MARIADB_COMMON_DEPENDS := \ MARIADB_COMMON_DEPENDS := \
$(ICONV_DEPENDS) \ $(ICONV_DEPENDS) \
+libatomic \
+libopenssl \ +libopenssl \
+libstdcpp \
+zlib +zlib
MARIADB_COMMON_DEPENDS_EXE := \
$(MARIADB_COMMON_DEPENDS) \
+libatomic \
+libstdcpp
# Pass CPPFLAGS in the CFLAGS as otherwise the build system will # Pass CPPFLAGS in the CFLAGS as otherwise the build system will
# ignore them. # ignore them.
TARGET_CFLAGS+=$(TARGET_CPPFLAGS) TARGET_CFLAGS+=$(TARGET_CPPFLAGS)
@ -256,7 +259,7 @@ define Package/mariadb-client-base
$(call Package/mariadb/Default) $(call Package/mariadb/Default)
TITLE:=MariaDB database client base TITLE:=MariaDB database client base
DEPENDS:=mariadb-common \ DEPENDS:=mariadb-common \
$(MARIADB_COMMON_DEPENDS) \
$(MARIADB_COMMON_DEPENDS_EXE) \
+libedit +libedit
endef endef
@ -324,7 +327,7 @@ endef
define Package/mariadb-server-base 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_EXE) \
+!arc:libaio \ +!arc:libaio \
+liblzma \ +liblzma \
+libpcre \ +libpcre \


Loading…
Cancel
Save