[Libreoffice-commits] .: icu/icu4c-rpath.patch icu/makefile.mk

[Petr Mladek]

 icu/icu4c-rpath.patch |   21 +++++++++++++++++++++
 icu/makefile.mk       |    1 +
 2 files changed, 22 insertions(+)

New commits:
commit 59fe2e067f22ab796bad9d2cda777de16e707ad5
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 29 17:59:06 2011 +0200

    icu-4.2.1-rpath.diff: pass $ORIGIN correctly to icu RPATH
    
    need to escape the dollar '$'

diff --git a/icu/icu4c-rpath.patch b/icu/icu4c-rpath.patch
new file mode 100644
index 0000000..5094a05
--- /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 8dda4b8..dbbd4c0 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 \