From c5f049680130a9af6c97856ea18869738811822b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 20 Sep 2012 15:00:50 +0200 Subject: Add RPATH to liblangtag ...so that it consistenly uses the LO versions of libxml2/glibc libs at runtime. Change-Id: I89b7fd13a8b5b7e697ec21db74fdf8ef088fdb92 (cherry picked from commit 179a6db61ee30cf776747802f06edeef45fec461) Reviewed-on: https://gerrit.libreoffice.org/661 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- liblangtag/makefile.mk | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'liblangtag') diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk index a8efa55b7d12..7efbc32fb490 100644 --- a/liblangtag/makefile.mk +++ b/liblangtag/makefile.mk @@ -72,6 +72,14 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -j$(EXTMAXPROCESS) && \ $(AUGMENT_LIBRARY_PATH) $(GNUMAKE) install +.IF "$(SYSTEM_LIBXML)"!="YES" || "$(SYSTEM_GLIB)"!="YES" +.IF "$(OS)"=="FREEBSD" || "$(OS)"=="LINUX" +CONFIGURE_FLAGS+= \ + LDFLAGS=-Wl,-z,origin\ -Wl,-rpath,\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\' +.ELIF "$(OS)"=="SOLARIS" +CONFIGURE_FLAGS+= LDFLAGS=-Wl,-R\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\' +.END +.END .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" -- cgit