Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10602 from micmac1/mary-104-deps

Browse source 
mariadb: prevent building against uClibc
This commit is contained in:
Rosen Penev 2019-11-20 14:51:19 -08:00 committed by GitHub
commit 994e7b86e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
utils/mariadb/Makefile
View file

@ -173,13 +173,11 @@ include $(INCLUDE_DIR)/nls.mk
MARIADB_COMMON_DEPENDS := \ MARIADB_COMMON_DEPENDS := \
$(ICONV_DEPENDS) \ $(ICONV_DEPENDS) \
+libopenssl \
+zlib
MARIADB_COMMON_DEPENDS_EXE := \
$(MARIADB_COMMON_DEPENDS) \
+libatomic \ +libatomic \
+libstdcpp +libopenssl \
+libstdcpp \
+zlib \
@!USE_UCLIBC
# 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.
@ -235,7 +233,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_EXE) \ $(MARIADB_COMMON_DEPENDS) \
+libedit +libedit
endef endef
@ -286,7 +284,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_EXE) \ $(MARIADB_COMMON_DEPENDS) \
+libaio \ +libaio \
+liblzma \ +liblzma \
+libpcre \ +libpcre \