diff options
| author | Rosen Penev <rosenp@gmail.com> | 2022-06-09 12:18:13 -0700 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2022-07-15 15:21:44 +0200 |
| commit | b37ef4b8abf2769732078ba510bf75abc83f007e (patch) | |
| tree | 3810e61074bbae50fbf6df3b642c51f793b53c3b /include/nls.mk | |
| parent | 92f0b7d4d25c8493270051298a4073f5b630bda3 (diff) | |
| download | upstream-b37ef4b8abf2769732078ba510bf75abc83f007e.tar.gz upstream-b37ef4b8abf2769732078ba510bf75abc83f007e.tar.bz2 upstream-b37ef4b8abf2769732078ba510bf75abc83f007e.zip | |
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>
Diffstat (limited to 'include/nls.mk')
| -rw-r--r-- | include/nls.mk | 15 |
1 files changed, 10 insertions, 5 deletions
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) |