diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:48:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:57:28 +0100 |
| commit | 45ca1bfc22f5d6857aeefc1e444f369cf6519805 (patch) | |
| tree | 47b0ca41002ac8adbb00f2a7d8bff916c0466c06 /external/icu | |
| parent | eef94c1655605ce890f182e31f3cc64ee3748625 (diff) | |
Fold URE: Linux ure/lib/* -> program/
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge
(and juh.jar had lacked adaption for Mac OS X).
Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
Diffstat (limited to 'external/icu')
| -rw-r--r-- | external/icu/icu4c-rpath.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/external/icu/icu4c-rpath.patch b/external/icu/icu4c-rpath.patch index dd4e2e755401..ba1a82595aea 100644 --- a/external/icu/icu4c-rpath.patch +++ b/external/icu/icu4c-rpath.patch @@ -21,14 +21,13 @@ @echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE) --- misc/icu/source/config/mh-linux 2010-09-29 20:37:36.000000000 +0200 +++ misc/build/icu/source/config/mh-linux 2011-03-15 10:56:26.653056004 +0100 -@@ -20,6 +20,11 @@ +@@ -20,6 +20,10 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN LD_RPATH_PRE = -Wl,-rpath, -+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH -+## (incl. the C++ runtime libs potentially found in the URE lib dir): ++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH: +ENABLE_RPATH=YES -+RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' ++RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' + ## These are the library specific LDFLAGS LDFLAGSICUDT=-nodefaultlibs -nostdlib |