diff options
| -rw-r--r-- | RepositoryExternal.mk | 20 | ||||
| -rw-r--r-- | RepositoryFixes.mk | 2 | ||||
| -rw-r--r-- | external/icu/ExternalPackage_icu.mk | 4 | ||||
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 5 |
4 files changed, 3 insertions, 28 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 79158939e7fb..6f1b306ac554 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1153,10 +1153,6 @@ define gb_LinkTarget__use_icui18n $(call gb_LinkTarget_add_libs,$(1),-licui18n) endef -define gb_LinkTarget__use_icutu -$(call gb_LinkTarget_add_libs,$(1),-licutu) - -endef define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_add_libs,$(1),-licuuc) @@ -1199,7 +1195,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) endif $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icutu$(gb_ICU_suffix) \ icuuc$(gb_ICU_suffix) \ )) @@ -1233,21 +1228,6 @@ endif endef -define gb_LinkTarget__use_icutu -$(call gb_LinkTarget_use_package,$(1),icu) - -ifeq ($(OS),WNT) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,icu)/source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ -) -else -$(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib -licutu$(gb_ICU_suffix) \ -) -endif - -endef - define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_use_package,$(1),icu) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index db0a30228409..726ba42405e2 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -71,7 +71,7 @@ endif endif ifeq ($(OS),WNT) -gb_Library_ICU_LIBRARIES := icudt icuuc icuin icutu +gb_Library_ICU_LIBRARIES := icudt icuuc icuin gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_ICU_LIBRARIES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_ICU_LIBRARIES),$(lib):$(lib)$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll) gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) 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 |