Преглед на файлове

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 <[email protected]>
Rosen Penev преди 3 години
родител
ревизия
b37ef4b8ab
променени са 1 файла, в които са добавени 10 реда и са изтрити 5 реда
  1. 10 5
      include/nls.mk

+ 10 - 5
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)