On Sun, Jun 5, 2022 at 11:02 AM Sebastian Kemper <sebastian...@gmx.net> wrote: > > gettext (libintl-stub) was removed in commit [1], so the libintl-stub > lib and include directories aren't existing anymore. This commit cleans > up the INTL flags for the BUILD_NLS=n case. > > [1] e6f569406ffe1d9e35b9b9ea36f38cdd5837728d > > Signed-off-by: Sebastian Kemper <sebastian...@gmx.net> Reviewed-by: Rosen Penev <ros...@gmail.com> > --- > include/nls.mk | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/include/nls.mk b/include/nls.mk > index 163e480932..665ccb565d 100644 > --- a/include/nls.mk > +++ b/include/nls.mk > @@ -15,7 +15,7 @@ else > ICONV_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-stub > ICONV_FULL:= > > - INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-stub > + INTL_PREFIX:= > INTL_FULL:= > endif > > @@ -28,9 +28,15 @@ ICONV_CPPFLAGS:=-I$(ICONV_PREFIX)/include > ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib -Wl,-rpath-link=$(ICONV_PREFIX)/lib > > INTL_DEPENDS:=+BUILD_NLS:libintl-full > -INTL_CFLAGS:=-I$(INTL_PREFIX)/include > -INTL_CPPFLAGS:=-I$(INTL_PREFIX)/include > -INTL_LDFLAGS:=-L$(INTL_PREFIX)/lib -Wl,-rpath-link=$(INTL_PREFIX)/lib > +ifeq ($(CONFIG_BUILD_NLS),y) > + INTL_CFLAGS:=-I$(INTL_PREFIX)/include > + INTL_CPPFLAGS:=-I$(INTL_PREFIX)/include > + INTL_LDFLAGS:=-L$(INTL_PREFIX)/lib -Wl,-rpath-link=$(INTL_PREFIX)/lib > +else > + INTL_CFLAGS:= > + INTL_CPPFLAGS:= > + INTL_LDFLAGS:= > +endif > > TARGET_CFLAGS += $(ICONV_CFLAGS) $(INTL_CFLAGS) > TARGET_CPPFLAGS += $(ICONV_CPPFLAGS) $(INTL_CPPFLAGS) > -- > 2.30.2 >
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
