diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-10 00:23:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-10 21:49:30 +0100 |
| commit | 57f4258e93aeed47bf8305602ae1acd2a20154b1 (patch) | |
| tree | ec554d1a5890887b214b493544befd1ad8f9ab69 /cairo | |
| parent | f7e552b202dc1d155f731e3da18737ea6c13e75f (diff) | |
cairo: fix RPATH:
The cairo configure script is called with -Wl,-rpath,"12345ORIGIN"
with funny results so tweak the quoting so that the $$ makes it through...
(cherry picked from commit 408672d41b261b33fb3bbc272d25815dda0e2663)
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index fda29afd2215..1eccae55898b 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -126,9 +126,9 @@ OUT2INC+=src$/cairo-quartz.h .ELSE # ----------- Unix --------------------------------------------------------- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack +cairo_LDFLAGS+=-Wl,-rpath,\$$$$ORIGIN:\$$$$ORIGIN/../ure-link/lib -Wl,-z,noexecstack .ELIF "$(OS)$(COM)"=="SOLARISC52" -cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' +cairo_LDFLAGS+=-Wl,-R\$$$$ORIGIN:\$$$$ORIGIN/../ure-link/lib .ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" .IF "$(SYSBASE)"!="" @@ -206,7 +206,7 @@ cairo_CFLAGS+=-g CONFIGURE_FLAGS+= STRIP=" " .ENDIF -CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)" +CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS='-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)' CPPFLAGS="$(cairo_CPPFLAGS)" .ENDIF |