cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1730 from kissg1988/libzdb

Browse Source 
libzdb: musl compatibility fix
This commit is contained in:
Steven Barth
2015-08-29 08:40:49 +02:00
parent 1ad3d0aab1 f323dd3690
commit d0554e68a0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libzdb/Makefile
+4
View File
@@ -23,6 +23,10 @@ PKG_BUILD_DEPENDS:=libzdb/host
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
ifeq ($(CONFIG_USE_MUSL),n)
LDFLAGS += -lnsl
endif
define Package/libzdb define Package/libzdb
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
libs/libzdb/patches/010-cross-compile-fixes.patch
+1 -1
View File
@@ -40,7 +40,7 @@ diff -rupN libzdb-3.0.orig/configure.ac libzdb-3.0/configure.ac
- DBCPPFLAGS="$DBCPPFLAGS `$MYSQLCONFIG --include`" - DBCPPFLAGS="$DBCPPFLAGS `$MYSQLCONFIG --include`"
- DBLDFLAGS="$DBLDFLAGS `$MYSQLCONFIG --libs`" - DBLDFLAGS="$DBLDFLAGS `$MYSQLCONFIG --libs`"
+ DBCPPFLAGS="$DBCPPFLAGS -I$STAGING_DIR/usr/include/mysql" + 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]) AC_DEFINE([HAVE_LIBMYSQLCLIENT], 1, [Define to 1 to enable mysql])
else else
CPPFLAGS=$svd_CPPFLAGS CPPFLAGS=$svd_CPPFLAGS