Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
d7ddb18d
Kaydet (Commit)
d7ddb18d
authored
Eki 23, 2013
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
icu: apparently "icutu" library is only used by genbrk etc. tools
Change-Id: I15a3cc3fcdca7d9c4f91e67a4517c9c3533efea7
üst
e353b2bc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
28 deletions
+3
-28
RepositoryExternal.mk
RepositoryExternal.mk
+0
-20
RepositoryFixes.mk
RepositoryFixes.mk
+1
-1
ExternalPackage_icu.mk
external/icu/ExternalPackage_icu.mk
+0
-4
ExternalProject_icu.mk
external/icu/ExternalProject_icu.mk
+2
-3
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
d7ddb18d
...
@@ -1152,10 +1152,6 @@ endef
...
@@ -1152,10 +1152,6 @@ endef
define gb_LinkTarget__use_icui18n
define gb_LinkTarget__use_icui18n
$(call gb_LinkTarget_add_libs,$(1),-licui18n)
$(call gb_LinkTarget_add_libs,$(1),-licui18n)
endef
define gb_LinkTarget__use_icutu
$(call gb_LinkTarget_add_libs,$(1),-licutu)
endef
endef
define gb_LinkTarget__use_icuuc
define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_add_libs,$(1),-licuuc)
$(call gb_LinkTarget_add_libs,$(1),-licuuc)
...
@@ -1199,7 +1195,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
...
@@ -1199,7 +1195,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
))
endif
endif
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icutu$(gb_ICU_suffix) \
icuuc$(gb_ICU_suffix) \
icuuc$(gb_ICU_suffix) \
))
))
...
@@ -1233,21 +1228,6 @@ endif
...
@@ -1233,21 +1228,6 @@ endif
endef
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
define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_use_package,$(1),icu)
$(call gb_LinkTarget_use_package,$(1),icu)
...
...
RepositoryFixes.mk
Dosyayı görüntüle @
d7ddb18d
...
@@ -71,7 +71,7 @@ endif
...
@@ -71,7 +71,7 @@ endif
endif
endif
ifeq ($(OS),WNT)
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 := $(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 += $(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))
gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
...
...
external/icu/ExternalPackage_icu.mk
Dosyayı görüntüle @
d7ddb18d
...
@@ -21,14 +21,12 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
...
@@ -21,14 +21,12 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
source/lib/icudt$(ICU_MAJOR).dll \
source/lib/icudt$(ICU_MAJOR).dll \
source/lib/icuuc$(ICU_MAJOR).dll \
source/lib/icuuc$(ICU_MAJOR).dll \
source/lib/icuin$(ICU_MAJOR).dll \
source/lib/icuin$(ICU_MAJOR).dll \
source/lib/icutu$(ICU_MAJOR).dll \
))
))
else
else
$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
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/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icuin$(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)
endif # $(COM)
...
@@ -38,7 +36,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\
...
@@ -38,7 +36,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\
source/lib/libicudatalo.so \
source/lib/libicudatalo.so \
source/lib/libicuuclo.so \
source/lib/libicuuclo.so \
source/lib/libicui18nlo.so \
source/lib/libicui18nlo.so \
source/lib/libicutulo.so \
))
))
else # $(OS) != WNT/ANDROID
else # $(OS) != WNT/ANDROID
...
@@ -46,7 +43,6 @@ 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/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/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_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 # $(OS)
endif # DISABLE_DYNLOADING
endif # DISABLE_DYNLOADING
...
...
external/icu/ExternalProject_icu.mk
Dosyayı görüntüle @
d7ddb18d
...
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
...
@@ -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) \
--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \
--disable-layout --disable-static --enable-shared --disable-samples \
--disable-layout --disable-static --enable-shared --disable-samples \
&& $(MAKE) \
&& $(MAKE) \
&& for lib in icudata icuin icuuc
icutu
; do \
&& for lib in icudata icuin icuuc; do \
touch $$lib; \
touch $$lib; \
done \
done \
,source)
,source)
...
@@ -90,8 +90,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
...
@@ -90,8 +90,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
$(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/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(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/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)) \
,source)
,source)
endif
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment