lede-packages-rs

commit d0554e68a0c14efd87872c6a04e705a5ff001810
parent 1ad3d0aab11abb214342bbec4679ea365f8b0735
Author: Steven Barth <steven@midlink.org>
Date:   Sat, 29 Aug 2015 08:40:49 +0200

Merge pull request #1730 from kissg1988/libzdb

libzdb: musl compatibility fix
Diffstat:
M
libs/libzdb/Makefile
 | 
4
++++
M
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
@@ -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
@@ -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