Procházet zdrojové kódy

Merge pull request #1730 from kissg1988/libzdb

libzdb: musl compatibility fix
Steven Barth před 9 roky
rodič
revize
d0554e68a0

+ 4
- 0
libs/libzdb/Makefile Zobrazit soubor

@@ -23,6 +23,10 @@ PKG_BUILD_DEPENDS:=libzdb/host
23 23
 
24 24
 include $(INCLUDE_DIR)/package.mk
25 25
 
26
+ifeq ($(CONFIG_USE_MUSL),n)
27
+    LDFLAGS += -lnsl
28
+endif
29
+
26 30
 define Package/libzdb
27 31
     SECTION:=libs
28 32
     CATEGORY:=Libraries

+ 1
- 1
libs/libzdb/patches/010-cross-compile-fixes.patch Zobrazit soubor

@@ -40,7 +40,7 @@ diff -rupN libzdb-3.0.orig/configure.ac libzdb-3.0/configure.ac
40 40
 -                DBCPPFLAGS="$DBCPPFLAGS `$MYSQLCONFIG --include`"
41 41
 -                DBLDFLAGS="$DBLDFLAGS `$MYSQLCONFIG --libs`"
42 42
 +                DBCPPFLAGS="$DBCPPFLAGS -I$STAGING_DIR/usr/include/mysql"
43
-+                DBLDFLAGS="$DBLDFLAGS -L$STAGING_DIR/usr/lib/mysql -L$STAGING_DIR/usr/lib -lmysqlclient -lz -lcrypt -lnsl -lm"
43
++                DBLDFLAGS="$DBLDFLAGS -L$STAGING_DIR/usr/lib/mysql -L$STAGING_DIR/usr/lib -lmysqlclient -lz -lcrypt -lm $LDFLAGS"
44 44
                  AC_DEFINE([HAVE_LIBMYSQLCLIENT], 1, [Define to 1 to enable mysql])
45 45
          else
46 46
                  CPPFLAGS=$svd_CPPFLAGS