[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - curl/ExternalProject_curl.mk

[Michael Stahl]

 curl/ExternalProject_curl.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9c677750f17798bec98a3553f73f9898d6aab8c6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 30 13:06:25 2013 +0100

    curl: set the right RPATH too
    
    Change-Id: I409bb44541748ad69b5087243f4ea8142e424fe0
    (cherry picked from commit 07a31ccc02f3553f1be3e8bb5ff67e6e6f7ce016)
    Reviewed-on: https://gerrit.libreoffice.org/6489
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk
index 23dce11..142a782 100644
--- a/curl/ExternalProject_curl.mk
+++ b/curl/ExternalProject_curl.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
 ifneq ($(OS),WNT)
 
 curl_CPPFLAGS :=
-curl_LDFLAGS :=
+curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)
 
 ifneq ($(SYSBASE),)
 curl_CPPFLAGS += -I$(SYSBASE)/usr/include
@@ -36,7 +36,7 @@ endif
 $(call gb_ExternalProject_get_state_target,curl,build):
 	$(call gb_ExternalProject_run,build,\
 		CPPFLAGS="$(curl_CPPFLAGS)" \
-		LDFLAGS="$(curl_LDFLAGS)" \
+		LDFLAGS=$(curl_LDFLAGS) \
 		./configure \
 			--with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out") \
 			--without-ssl \