From 34ca8dd9adb62c1154f979887a38483d73da978b Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 29 Aug 2012 11:27:23 +0200 Subject: fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGIN Signed-off-by: Stephan Bergmann : * bulk replacement of "-Wl,-z,origin,-rpath,..." with "-Wl,-z,origin -Wl,rpath,..." * additional hunk for directory/c-sdk/config/FreeBSD.mk in moz/seamonkey-source-1.1.14.patch did not apply and has been dropped Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7 --- libxmlsec/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libxmlsec') diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 2f0550f07df1..38ce01359baf 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -154,8 +154,8 @@ xmlsec_CPPFLAGS+=$(EXTRA_CDEFS) .ENDIF .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +xmlsec_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" .IF "$(OS)$(COM)"=="SOLARISC52" xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" -- cgit