diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-22 00:52:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-22 01:06:54 +0100 |
| commit | 0e72992d7492f36716e73068f9f93d9f25da9b02 (patch) | |
| tree | 22b7e573d898be937b862f4aa34ce5182b1712e0 /libxslt | |
| parent | cad65120c6da901bf9fe33ab16ad22217efed0c0 (diff) | |
libxslt, redland: properly quote rpath $ORIGIN
... so it can be passed from make to shell to configure to generated
Makefile to libtool to invoked gcc without loss of valuable dollars.
It is an open question to which extent this commit should be credited to
the designers of sh, autoconf, libtool, make, and/or Solaris ld.
Change-Id: I0709a49d7025dbfda4d9c0e7202ea932ec85e0cb
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/ExternalProject_xslt.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk index b6aac212c8d0..b64eb935c73d 100644 --- a/libxslt/ExternalProject_xslt.mk +++ b/libxslt/ExternalProject_xslt.mk @@ -43,8 +43,8 @@ $(call gb_ExternalProject_get_state_target,xslt,build): && ./configure --without-crypto --without-python \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl$(COMMA)-noinhibit-exec) \ - $(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ + LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \ + $(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \ $(if $(filter IOS,$(OS)),LIBS="-liconv") \ @@ -54,4 +54,5 @@ $(call gb_ExternalProject_get_state_target,xslt,build): && $(MAKE) \ && touch $@ endif + # vim: set noet sw=4 ts=4: |