diff options
| -rw-r--r-- | icu/icu4c-build.patch | 14 | ||||
| -rw-r--r-- | icu/icu4c-rpath.patch | 14 | ||||
| -rw-r--r-- | icu/makefile.mk | 4 |
3 files changed, 17 insertions, 15 deletions
diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index 8082fc1ea135..6ab5ea3c2e14 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -98,20 +98,6 @@ ## Remove shared library 's' STATIC_PREFIX_WHEN_USED = ---- 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 @@ - 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): -+ENABLE_RPATH=YES -+RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' -+ - ## These are the library specific LDFLAGS - LDFLAGSICUDT=-nodefaultlibs -nostdlib - --- misc/icu/source/layout/ArabicShaping.cpp 2010-09-29 20:38:38.000000000 +0200 +++ misc/build/icu/source/layout/ArabicShaping.cpp 2011-03-15 10:56:26.655056238 +0100 @@ -79,7 +79,6 @@ diff --git a/icu/icu4c-rpath.patch b/icu/icu4c-rpath.patch index 5094a05ae56c..bd625e9e96ce 100644 --- a/icu/icu4c-rpath.patch +++ b/icu/icu4c-rpath.patch @@ -19,3 +19,17 @@ @echo LDICUDTFLAGS=$(LDFLAGSICUDT) >> $(OUTPUTFILE) @echo LD_SONAME=$(LD_SONAME) >> $(OUTPUTFILE) @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 @@ + 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): ++ENABLE_RPATH=YES ++RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' ++ + ## These are the library specific LDFLAGS + LDFLAGSICUDT=-nodefaultlibs -nostdlib + diff --git a/icu/makefile.mk b/icu/makefile.mk index 38bbcddedd93..afedbbce8d1d 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -46,7 +46,6 @@ TARFILE_ROOTDIR=icu PATCH_FILES=\ icu4c-build.patch \ - icu4c-rpath.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch \ icu4c-wchar_t.patch \ @@ -58,6 +57,9 @@ PATCH_FILES=\ .IF "$(OS)"=="ANDROID" PATCH_FILES+=\ icu4c-android.patch +.ELSE +PATCH_FILES+=\ + icu4c-rpath.patch .ENDIF .IF "$(GUI)"=="UNX" |