diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 14:25:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 15:48:53 +0200 |
| commit | 8a3ea757c35a000ea303a11b36692aebc2400ead (patch) | |
| tree | 4712f03edc94684407ad2acc2345e6ee4081066d /icu | |
| parent | 6af8887b41a8438d29b4743f238be7330516ecbc (diff) | |
Use --with-library-suffix=lo for Android to avoid clash with system ICU
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 16 | ||||
| -rw-r--r-- | icu/prj/d.lst | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index f0e9dfa5a770..79889a2d78ac 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -136,8 +136,12 @@ STATIC_OR_SHARED=--disable-static --enable-shared BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(posix_PWD)/$(INPATH_FOR_BUILD)/misc/build/icu/source .ENDIF +.IF "$(OS)"=="ANDROID" +LIBRARY_SUFFIX= --with-library-suffix=lo +.ENDIF + CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ -./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) ' +./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) $(LIBRARY_SUFFIX)' CONFIGURE_FLAGS= @@ -159,11 +163,11 @@ OUT2LIB= \ $(BUILD_DIR)$/lib$/libicutu.a .ELIF "$(OS)"=="ANDROID" OUT2LIB= \ - $(BUILD_DIR)$/lib$/libicudata.so \ - $(BUILD_DIR)$/lib$/libicuuc.so \ - $(BUILD_DIR)$/lib$/libicui18n.so \ - $(BUILD_DIR)$/lib$/libicule.so \ - $(BUILD_DIR)$/lib$/libicutu.so + $(BUILD_DIR)$/lib$/libicudatalo.so \ + $(BUILD_DIR)$/lib$/libicuuclo.so \ + $(BUILD_DIR)$/lib$/libicui18nlo.so \ + $(BUILD_DIR)$/lib$/libiculelo.so \ + $(BUILD_DIR)$/lib$/libicutulo.so .ELSE OUT2LIB= \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \ diff --git a/icu/prj/d.lst b/icu/prj/d.lst index 3ae4de0a7e09..91000be94451 100644 --- a/icu/prj/d.lst +++ b/icu/prj/d.lst @@ -31,6 +31,12 @@ mkdir: %_DEST%\inc\external\unicode ..\%__SRC%\lib\libicuuc.so %_DEST%\lib\ ..\%__SRC%\lib\libicutu.so %_DEST%\lib\ +..\%__SRC%\lib\libicudatalo.so %_DEST%\lib\ +..\%__SRC%\lib\libicui18nlo.so %_DEST%\lib\ +..\%__SRC%\lib\libiculelo.so %_DEST%\lib\ +..\%__SRC%\lib\libicuuclo.so %_DEST%\lib\ +..\%__SRC%\lib\libicutulo.so %_DEST%\lib\ + ..\%__SRC%\lib\libicudata.a %_DEST%\lib\ ..\%__SRC%\lib\libicui18n.a %_DEST%\lib\ ..\%__SRC%\lib\libicule.a %_DEST%\lib\ |