From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 9 Jun 2022 19:18:13 +0000 (-0700)
Subject: nls.mk: remove libiconv-stub
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b37ef4b8abf2769732078ba510bf75abc83f007e;p=openwrt%2Fstaging%2Faparcar.git

nls.mk: remove libiconv-stub

This was previously needed for uClibc-ng. Now that it's gone, it can go
away in nls.mk too.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/include/nls.mk b/include/nls.mk
index 665ccb565d..7f9935b5c3 100644
--- a/include/nls.mk
+++ b/include/nls.mk
@@ -10,9 +10,8 @@ ifeq ($(CONFIG_BUILD_NLS),y)
 	INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-full
 	INTL_FULL:=1
 
-# iconv stub
 else
-	ICONV_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-stub
+	ICONV_PREFIX:=
 	ICONV_FULL:=
 
 	INTL_PREFIX:=
@@ -23,9 +22,15 @@ PKG_CONFIG_DEPENDS += CONFIG_BUILD_NLS
 PKG_BUILD_DEPENDS += !BUILD_NLS:libiconv
 
 ICONV_DEPENDS:=+BUILD_NLS:libiconv-full
-ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include
-ICONV_CPPFLAGS:=-I$(ICONV_PREFIX)/include
-ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib -Wl,-rpath-link=$(ICONV_PREFIX)/lib
+ifeq ($(CONFIG_BUILD_NLS),y)
+	ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include
+	ICONV_CPPFLAGS:=-I$(ICONV_PREFIX)/include
+	ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib -Wl,-rpath-link=$(ICONV_PREFIX)/lib
+else
+	ICONV_CFLAGS:=
+	ICONV_CPPFLAGS:=
+	ICONV_LDFLAGS:=
+endif
 
 INTL_DEPENDS:=+BUILD_NLS:libintl-full
 ifeq ($(CONFIG_BUILD_NLS),y)