diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2018-07-13 23:10:51 +0200 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2018-07-13 23:12:03 +0200 |
| commit | b25b0fc2eb41f69b8ad6119a47d9263234837ce0 (patch) | |
| tree | 5852c656d2368a340ab6fe1d7082c7c2d6775de4 /libs/libzdb | |
| parent | 3fdef4e2f309aeec69686e02a29f1f8cb1b4618b (diff) | |
libzdb: remove iconv hack, include nls.mk
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>
Diffstat (limited to 'libs/libzdb')
| -rw-r--r-- | libs/libzdb/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libs/libzdb/Makefile b/libs/libzdb/Makefile index 8c0f9c5a2..e3d1c276d 100644 --- a/libs/libzdb/Makefile +++ b/libs/libzdb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzdb PKG_VERSION:=3.1 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LICENSE:=GPL-3.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -22,14 +22,8 @@ PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=libzdb/host include $(INCLUDE_DIR)/package.mk - -# Help libzdb find libiconv.so when using uClibc. -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 +# libzdb needs to find iconv when linking to libmariadb +include $(INCLUDE_DIR)/nls.mk define Package/libzdb SECTION:=libs |