From f323dd3690db5ea042da3d20f7bd1328c55827fc Mon Sep 17 00:00:00 2001 From: Gergely Kiss Date: Sat, 29 Aug 2015 00:55:29 +0200 Subject: [PATCH] libzdb: musl compatibility fix Signed-off-by: Gergely Kiss --- libs/libzdb/Makefile | 4 ++++ libs/libzdb/patches/010-cross-compile-fixes.patch | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/libzdb/Makefile b/libs/libzdb/Makefile index 96bf3a625..f3fc66eed 100644 --- a/libs/libzdb/Makefile +++ b/libs/libzdb/Makefile @@ -23,6 +23,10 @@ PKG_BUILD_DEPENDS:=libzdb/host include $(INCLUDE_DIR)/package.mk +ifeq ($(CONFIG_USE_MUSL),n) + LDFLAGS += -lnsl +endif + define Package/libzdb SECTION:=libs CATEGORY:=Libraries diff --git a/libs/libzdb/patches/010-cross-compile-fixes.patch b/libs/libzdb/patches/010-cross-compile-fixes.patch index 18507da87..489b18c0a 100644 --- a/libs/libzdb/patches/010-cross-compile-fixes.patch +++ b/libs/libzdb/patches/010-cross-compile-fixes.patch @@ -40,7 +40,7 @@ diff -rupN libzdb-3.0.orig/configure.ac libzdb-3.0/configure.ac - DBCPPFLAGS="$DBCPPFLAGS `$MYSQLCONFIG --include`" - DBLDFLAGS="$DBLDFLAGS `$MYSQLCONFIG --libs`" + DBCPPFLAGS="$DBCPPFLAGS -I$STAGING_DIR/usr/include/mysql" -+ DBLDFLAGS="$DBLDFLAGS -L$STAGING_DIR/usr/lib/mysql -L$STAGING_DIR/usr/lib -lmysqlclient -lz -lcrypt -lnsl -lm" ++ DBLDFLAGS="$DBLDFLAGS -L$STAGING_DIR/usr/lib/mysql -L$STAGING_DIR/usr/lib -lmysqlclient -lz -lcrypt -lm $LDFLAGS" AC_DEFINE([HAVE_LIBMYSQLCLIENT], 1, [Define to 1 to enable mysql]) else CPPFLAGS=$svd_CPPFLAGS