diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-03-29 17:59:06 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-03-29 17:59:06 +0200 |
| commit | d1163460846f979311a04835eb99a3f6a2743fab (patch) | |
| tree | ff06aacba6296378f21a5acdc74d2e0eb5b3be1f /icu | |
| parent | 12ca87a42a67c397544a96a2c3eb80ec998213ed (diff) | |
icu-4.2.1-rpath.diff: pass $ORIGIN correctly to icu RPATH
need to escape the dollar '$'
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-rpath.patch | 21 | ||||
| -rw-r--r-- | icu/makefile.mk | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/icu/icu4c-rpath.patch b/icu/icu4c-rpath.patch new file mode 100644 index 000000000000..5094a05ae56c --- /dev/null +++ b/icu/icu4c-rpath.patch @@ -0,0 +1,21 @@ +--- misc/icu/source/data/pkgdataMakefile.in 2010-12-22 23:44:02.000000000 +0100 ++++ misc/build/icu/source/data/pkgdataMakefile.in 2011-01-03 17:52:44.000000000 +0100 +@@ -15,6 +15,9 @@ include $(top_builddir)/icudefs.mk + OUTPUTFILE=icupkg.inc + MIDDLE_SO_TARGET= + ++# escape $ with \ when passing to echo; needed to preserve $ORIGIN ++SHLIB.c.shell := $(subst $$,\$$,$(SHLIB.c)) ++ + all : clean + @echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE) + @echo SO=$(SO) >> $(OUTPUTFILE) +@@ -24,7 +27,7 @@ all : clean + @echo LIB_EXT_ORDER=$(FINAL_SO_TARGET) >> $(OUTPUTFILE) + @echo COMPILE="$(COMPILE.c)" >> $(OUTPUTFILE) + @echo LIBFLAGS="-I$(top_srcdir)/common -I$(top_builddir)/common $(SHAREDLIBCPPFLAGS) $(SHAREDLIBCFLAGS)" >> $(OUTPUTFILE) +- @echo GENLIB="$(SHLIB.c)" >> $(OUTPUTFILE) ++ @echo GENLIB="$(SHLIB.c.shell)" >> $(OUTPUTFILE) + @echo LDICUDTFLAGS=$(LDFLAGSICUDT) >> $(OUTPUTFILE) + @echo LD_SONAME=$(LD_SONAME) >> $(OUTPUTFILE) + @echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE) diff --git a/icu/makefile.mk b/icu/makefile.mk index 8dda4b894bc0..dbbd4c08d0fd 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -46,6 +46,7 @@ TARFILE_ROOTDIR=icu PATCH_FILES=\ icu4c-build.patch \ + icu4c-rpath.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch \ icu4c-4_4_2-wchar_t.patch \ |