From: Rosen Penev Date: Sat, 16 Jul 2022 02:39:39 +0000 (-0700) Subject: slang2: try to fix compilation without BUILD_NLS X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F18948%2Fhead;p=feed%2Fpackages.git slang2: try to fix compilation without BUILD_NLS Using --with-iconv like this causes -liconv to get added, which is not desirable. Signed-off-by: Rosen Penev --- diff --git a/libs/slang2/Makefile b/libs/slang2/Makefile index fcb0793ed6..28affd96c2 100644 --- a/libs/slang2/Makefile +++ b/libs/slang2/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=slang PKG_VERSION:=2.3.2 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.jedsoft.org/releases/slang \ @@ -23,6 +23,7 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Jeffery To PKG_BUILD_PARALLEL:=0 +PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS SLANG_MODULES:= base64 chksum csv fcntl fork histogram iconv json onig pcre \ png rand select slsmg socket stats sysconf termios varray zlib @@ -114,7 +115,7 @@ CONFIGURE_ARGS+= \ --enable-warnings \ --with-terminfo=default \ --with-readline=slang \ - --with-iconv="$(ICONV_PREFIX)" \ + $(if $(CONFIG_BUILD_NLS),--with-iconv=$(ICONV_PREFIX)) \ --with-onig="$(STAGING_DIR)/usr" \ --with-pcre="$(STAGING_DIR)/usr" \ --with-png="$(STAGING_DIR)/usr" \