diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 15:20:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-23 19:21:14 +0200 |
| commit | d7ddb18d41c7f58a28ba428defb4632d99f0ab6a (patch) | |
| tree | fe2ddb86b521b9d17c2adfe0d4e6a47484d0200e /external | |
| parent | e353b2bcc26b8f6c12a916dcd67587ea89f3db55 (diff) | |
icu: apparently "icutu" library is only used by genbrk etc. tools
Change-Id: I15a3cc3fcdca7d9c4f91e67a4517c9c3533efea7
Diffstat (limited to 'external')
| -rw-r--r-- | external/icu/ExternalPackage_icu.mk | 4 | ||||
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk index 635e9d7d93b4..c5ff8266f3d4 100644 --- a/external/icu/ExternalPackage_icu.mk +++ b/external/icu/ExternalPackage_icu.mk @@ -21,14 +21,12 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(ICU_MAJOR).dll \ source/lib/icuuc$(ICU_MAJOR).dll \ source/lib/icuin$(ICU_MAJOR).dll \ - source/lib/icutu$(ICU_MAJOR).dll \ )) else $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ - source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ )) endif # $(COM) @@ -38,7 +36,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\ source/lib/libicudatalo.so \ source/lib/libicuuclo.so \ source/lib/libicui18nlo.so \ - source/lib/libicutulo.so \ )) else # $(OS) != WNT/ANDROID @@ -46,7 +43,6 @@ else # $(OS) != WNT/ANDROID $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) endif # $(OS) endif # DISABLE_DYNLOADING diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 52cac492f7db..f34871857810 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \ --disable-layout --disable-static --enable-shared --disable-samples \ && $(MAKE) \ - && for lib in icudata icuin icuuc icutu; do \ + && for lib in icudata icuin icuuc; do \ touch $$lib; \ done \ ,source) @@ -90,8 +90,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ $(gb_Package_SOURCEDIR_icu)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \ $(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \ - $(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION) \ - $(gb_Package_SOURCEDIR_icu)/source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)) \ + $(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)) \ ,source) endif |