mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

curl: set the right RPATH too

Browse Source 
Change-Id: I409bb44541748ad69b5087243f4ea8142e424fe0
This commit is contained in:
Michael Stahl
2013-10-30 13:06:25 +01:00
parent ce85ba3e2e
commit 07a31ccc02
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
external/curl/ExternalProject_curl.mk vendored
View File

@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
ifneq ($(OS),WNT) ifneq ($(OS),WNT)
curl_CPPFLAGS := 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),) ifneq ($(SYSBASE),)
curl_CPPFLAGS += -I$(SYSBASE)/usr/include curl_CPPFLAGS += -I$(SYSBASE)/usr/include
@@ -36,7 +36,7 @@ endif
$(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
CPPFLAGS="$(curl_CPPFLAGS)" \ CPPFLAGS="$(curl_CPPFLAGS)" \
LDFLAGS="$(curl_LDFLAGS)" \ LDFLAGS=$(curl_LDFLAGS) \
./configure \ ./configure \
--with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out") \ --with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out") \
--without-ssl \ --without-ssl \