external/icu/icu4c-rpath.patch

   1 --- misc/icu/source/data/pkgdataMakefile.in     2010-12-22 23:44:02.000000000 +0100
   2 +++ misc/build/icu/source/data/pkgdataMakefile.in       2011-01-03 17:52:44.000000000 +0100
   3 @@ -15,6 +15,9 @@ include $(top_builddir)/icudefs.mk
   4  OUTPUTFILE=icupkg.inc
   5  MIDDLE_SO_TARGET=
   6
   7 +# escape $ with \ when passing to echo; needed to preserve $ORIGIN
   8 +SHLIB.c.shell := $(subst $$,\$$,$(SHLIB.c))
   9 +
  10  all : clean
  11         @echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
  12         @echo SO=$(SO) >> $(OUTPUTFILE)
  13 @@ -24,7 +27,7 @@ all : clean
  14         @echo LIB_EXT_ORDER=$(FINAL_SO_TARGET) >> $(OUTPUTFILE)
  15         @echo COMPILE="$(COMPILE.c)" >> $(OUTPUTFILE)
  16         @echo LIBFLAGS="-I$(top_srcdir)/common -I$(top_builddir)/common $(SHAREDLIBCPPFLAGS) $(SHAREDLIBCFLAGS)" >> $(OUTPUTFILE)
  17 -       @echo GENLIB="$(SHLIB.c)" >> $(OUTPUTFILE)
  18 +       @echo GENLIB="$(SHLIB.c.shell)" >> $(OUTPUTFILE)
  19         @echo LDICUDTFLAGS=$(LDFLAGSICUDT) >> $(OUTPUTFILE)
  20         @echo LD_SONAME=$(LD_SONAME) >> $(OUTPUTFILE)
  21         @echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE)
  22 --- misc/icu/source/config/mh-linux     2010-09-29 20:37:36.000000000 +0200
  23 +++ misc/build/icu/source/config/mh-linux       2011-03-15 10:56:26.653056004 +0100
  24 @@ -20,6 +20,10 @@
  25  LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
  26  LD_RPATH_PRE = -Wl,-rpath,
  27
  28 +## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH:
  29 +ENABLE_RPATH=YES
  30 +RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
  31 +
  32  ## These are the library specific LDFLAGS
  33  LDFLAGSICUDT=-nodefaultlibs -nostdlib
  34
  35