diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-28 09:10:02 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-28 09:26:54 +0200 |
| commit | 1b6e55eb350e22147a22ad22c1c4f08fc6ed19f5 (patch) | |
| tree | e67ef22302c059eb9f1d81adb9a73e2db3b1b646 /icu | |
| parent | 36f2d5266a0fdea67d8868048341fb0638184756 (diff) | |
De-fuzz
Change-Id: I47e206350331e3edeef9edcb0514eacb66db7c07
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-rpath.patch | 2 | ||||
| -rw-r--r-- | icu/icu4c-wchar_t.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/icu/icu4c-rpath.patch b/icu/icu4c-rpath.patch index bd625e9e96ce..44ab8a652923 100644 --- a/icu/icu4c-rpath.patch +++ b/icu/icu4c-rpath.patch @@ -22,7 +22,7 @@ --- 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= -Wl,-zorigin,-rpath,'$$'ORIGIN LD_RPATH_PRE = -Wl,-rpath, +## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH diff --git a/icu/icu4c-wchar_t.patch b/icu/icu4c-wchar_t.patch index bb788dcaf90a..2360a08f03a6 100644 --- a/icu/icu4c-wchar_t.patch +++ b/icu/icu4c-wchar_t.patch @@ -11,5 +11,5 @@ +CFLAGS+=/GF /nologo /Zc:wchar_t- +CXXFLAGS+=/GF /nologo /EHsc /Zc:wchar_t- CPPFLAGS+=-D_CRT_SECURE_NO_DEPRECATE - DEFS+=-DWIN32 - DEFS+=-DCYGWINMSVC + DEFS+=-DWIN32 -DCYGWINMSVC + LDFLAGS+=/nologo |