external/icu/icu4c-rpath.patch.1

   1 diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux
   2 --- icu.org/source/config/mh-linux      2016-06-15 20:58:17.000000000 +0200
   3 +++ icu/source/config/mh-linux  2017-04-21 22:38:18.893927819 +0200
   4 @@ -22,6 +22,10 @@
   5  LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
   6  LD_RPATH_PRE = -Wl,-rpath,
   7
   8 +## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH:
   9 +ENABLE_RPATH=YES
  10 +RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
  11 +
  12  ## These are the library specific LDFLAGS
  13  LDFLAGSICUDT=-nodefaultlibs -nostdlib
  14
  15 diff -ur icu.org/source/data/pkgdataMakefile.in icu/source/data/pkgdataMakefile.in
  16 --- icu.org/source/data/pkgdataMakefile.in      2016-06-15 20:58:17.000000000 +0200
  17 +++ icu/source/data/pkgdataMakefile.in  2017-04-21 22:38:18.892927822 +0200
  18 @@ -18,6 +18,9 @@
  19  MIDDLE_SO_TARGET=
  20  PKGDATA_TRAILING_SPACE=" "
  21
  22 +# escape $ with \ when passing to echo; needed to preserve $ORIGIN
  23 +SHLIB.c.shell := $(subst $$,\$$,$(SHLIB.c))
  24 +
  25  all : clean
  26         @echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
  27         @echo SO=$(SO) >> $(OUTPUTFILE)
  28 @@ -26,7 +29,7 @@
  29         @echo LIB_EXT_ORDER=$(FINAL_SO_TARGET) >> $(OUTPUTFILE)
  30         @echo COMPILE="$(COMPILE.c)" >> $(OUTPUTFILE)
  31         @echo LIBFLAGS="-I$(top_srcdir)/common -I$(top_builddir)/common $(SHAREDLIBCPPFLAGS) $(SHAREDLIBCFLAGS)" >> $(OUTPUTFILE)
  32 -       @echo GENLIB="$(SHLIB.c)" >> $(OUTPUTFILE)
  33 +       @echo GENLIB="$(SHLIB.c.shell)" >> $(OUTPUTFILE)
  34         @echo LDICUDTFLAGS=$(LDFLAGSICUDT) >> $(OUTPUTFILE)
  35         @echo LD_SONAME=$(LD_SONAME) >> $(OUTPUTFILE)
  36         @echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE)