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

libzdb: remove iconv hack, include nls.mk

Browse source 
mariadb was sorted out by including nls.mk. Include it also in libzdb
and get rid of the previously introduced hack.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2018-07-13 23:10:51 +02:00
parent 3fdef4e2f3
commit b25b0fc2eb
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libs/libzdb/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libzdb PKG_NAME:=libzdb
PKG_VERSION:=3.1 PKG_VERSION:=3.1
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -22,14 +22,8 @@ PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=libzdb/host PKG_BUILD_DEPENDS:=libzdb/host
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
# libzdb needs to find iconv when linking to libmariadb
# Help libzdb find libiconv.so when using uClibc. include $(INCLUDE_DIR)/nls.mk
ifneq ($(CONFIG_USE_UCLIBC),)
TARGET_CPPFLAGS+= \
-I$(STAGING_DIR)/usr/lib/libiconv-full/include
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libiconv-full/lib
endif
define Package/libzdb define Package/libzdb
SECTION:=libs SECTION:=libs