kernel: bump 5.15 to 5.15.148

[openwrt/staging/jow.git] / include / nls.mk

diff --git a/include/nls.mk b/include/nls.mk
index 665ccb565db70217122cce4b38cf1f071e847bb5..f054d2bb68af77b277e6de8f0dcca13287a1c9f8 100644 (file)
--- a/include/nls.mk
+++ b/include/nls.mk
@@ -10,9 +10,9 @@ ifeq ($(CONFIG_BUILD_NLS),y)
        INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-full
        INTL_FULL:=1
 
-# iconv stub
+       CMAKE_OPTIONS += -DCMAKE_PREFIX_PATH="$(ICONV_PREFIX);$(INTL_PREFIX)"
 else
-       ICONV_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-stub
+       ICONV_PREFIX:=
        ICONV_FULL:=
 
        INTL_PREFIX:=
@@ -20,12 +20,17 @@ else
 endif
 
 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)