summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2015-09-07 08:03:34 +0000
committerSteven Barth <cyrus@openwrt.org>2015-09-07 08:03:34 +0000
commit049baba1ef3e7fdf3718209f31fbb7bcfdf9a607 (patch)
tree586e60a175cd4f8660721a9fe2de11ecf61d19b5
parentd571f17129909ac795e94c7f9ec1f1c09eb3bac9 (diff)
downloadmaster-31e0f0ae-049baba1ef3e7fdf3718209f31fbb7bcfdf9a607.tar.gz
master-31e0f0ae-049baba1ef3e7fdf3718209f31fbb7bcfdf9a607.tar.bz2
master-31e0f0ae-049baba1ef3e7fdf3718209f31fbb7bcfdf9a607.zip
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 <fercerpav@gmail.com> SVN-Revision: 46801
-rw-r--r--include/nls.mk4
1 files changed, 2 insertions, 2 deletions
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)