Browse Source

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>
lilik-openwrt-22.03
Sebastian Kemper 7 years ago
parent
commit
b25b0fc2eb
1 changed files with 3 additions and 9 deletions
  1. +3
    -9
      libs/libzdb/Makefile

+ 3
- 9
libs/libzdb/Makefile View File

@ -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


Loading…
Cancel
Save