From: Steven Barth Date: Mon, 7 Sep 2015 08:03:34 +0000 (+0000) Subject: nls.mk: add -rpath-link when needed for NLS support X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=049baba1ef3e7fdf3718209f31fbb7bcfdf9a607;p=openwrt%2Fstaging%2Fyousong.git nls.mk: add -rpath-link when needed for NLS support When a package links to a shared library that depends on libiconv or libintl shared libraries, specifying directory pathes to them via -L switches is not enough, see "man 1 ld" -rpath-link description. Signed-off-by: Paul Fertser SVN-Revision: 46801 --- diff --git a/include/nls.mk b/include/nls.mk index 118000d3ee..51463b9f12 100644 --- a/include/nls.mk +++ b/include/nls.mk @@ -28,12 +28,12 @@ PKG_BUILD_DEPENDS += !BUILD_NLS:libiconv !BUILD_NLS:libintl ICONV_DEPENDS:=+BUILD_NLS:libiconv-full ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include ICONV_CPPFLAGS:=-I$(ICONV_PREFIX)/include -ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib +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 +INTL_LDFLAGS:=-L$(INTL_PREFIX)/lib -Wl,-rpath-link=$(INTL_PREFIX)/lib TARGET_CFLAGS += $(ICONV_CFLAGS) $(INTL_CFLAGS) TARGET_CPPFLAGS += $(ICONV_CPPFLAGS) $(INTL_CPPFLAGS)