diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:21:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:21:45 +0000 |
| commit | 65c3bcaf66ec292516e5c40193072ad6b73a3dc0 (patch) | |
| tree | 2d73f3e3351a5b3b54eb627115bee416ca19d419 /icu | |
| parent | ccf64e4e5134f605ea917edcdfd32545b22854d7 (diff) | |
INTEGRATION: CWS sb71 (1.5.12); FILE MERGED
2007/06/15 08:40:41 sb 1.5.12.2: RESYNC: (1.5-1.7); FILE MERGED
2007/06/14 09:40:51 sb 1.5.12.1: #i75466# Adapted RPATHs to find shared libraries in extracted URE.
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu-3.6.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/icu/icu-3.6.patch b/icu/icu-3.6.patch index e51fdc8620ee..aa7d1a9b330e 100644 --- a/icu/icu-3.6.patch +++ b/icu/icu-3.6.patch @@ -111,16 +111,17 @@ --- misc/build/icu/source/config/mh-linux Mon Apr 30 17:32:58 2007 *************** *** 20,25 **** ---- 20,32 ---- +--- 20,33 ---- LD_RPATH= 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): + ENABLE_RPATH=YES -+ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' ++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' + + #SH# ENABLE_RPATH=YES -+ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'" ++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'" + ## These are the library specific LDFLAGS LDFLAGSICUDT=-nodefaultlibs -nostdlib |