mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to install non-SONAME versions of icu libs

Browse Source 
Change-Id: Ica8057c70f5e4b63830c6ffe7fb85269a10b845f
This commit is contained in:
Stephan Bergmann
2013-09-02 23:08:19 +02:00
parent fd636fe722
commit e486f1612d
4 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
icu/ExternalPackage_icu.mk
View File

@@ -66,16 +66,12 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\
source/lib/libicutulo.so \ source/lib/libicutulo.so \
)) ))
else else
$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION),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/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION),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/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION),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_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/libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicutu$(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))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)))

1
scp2/InstallModule_ooo.mk
View File

@@ -114,7 +114,6 @@ endif
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \ -DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
)) ))
ifneq ($(SYSTEM_LIBXSLT),YES) ifneq ($(SYSTEM_LIBXSLT),YES)

6
scp2/source/ooo/file_library_ooo.scp
View File

@@ -196,7 +196,7 @@ End
File gid_File_Lib_Icudata File gid_File_Lib_Icudata
PACKED_LIB_FILE_BODY; PACKED_LIB_FILE_BODY;
#ifdef UNX #ifdef UNX
Name = STRING(CONCAT6(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR));
#else #else
#ifdef MSVC_PKG_DEBUG_RUNTIME #ifdef MSVC_PKG_DEBUG_RUNTIME
Name = STRING(CONCAT3(icudtd,ICU_MAJOR,.dll)); Name = STRING(CONCAT3(icudtd,ICU_MAJOR,.dll));
@@ -209,7 +209,7 @@ End
File gid_File_Lib_Icui18n File gid_File_Lib_Icui18n
PACKED_LIB_FILE_BODY; PACKED_LIB_FILE_BODY;
#ifdef UNX #ifdef UNX
Name = STRING(CONCAT6(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR));
#else #else
#ifdef MSVC_PKG_DEBUG_RUNTIME #ifdef MSVC_PKG_DEBUG_RUNTIME
Name = STRING(CONCAT3(icuind,ICU_MAJOR,.dll)); Name = STRING(CONCAT3(icuind,ICU_MAJOR,.dll));
@@ -222,7 +222,7 @@ End
File gid_File_Lib_Icuuc File gid_File_Lib_Icuuc
PACKED_LIB_FILE_BODY; PACKED_LIB_FILE_BODY;
#ifdef UNX #ifdef UNX
Name = STRING(CONCAT6(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR));
#else #else
#ifdef MSVC_PKG_DEBUG_RUNTIME #ifdef MSVC_PKG_DEBUG_RUNTIME
Name = STRING(CONCAT3(icuucd,ICU_MAJOR,.dll)); Name = STRING(CONCAT3(icuucd,ICU_MAJOR,.dll));

40
scp2/source/ooo/shortcut_ooo.scp
View File

@@ -18,46 +18,6 @@
#include "macros.inc" #include "macros.inc"
#ifdef UNX
#ifndef SYSTEM_ICU
Shortcut gid_Shortcut_Lib_Icudata
FileID = gid_File_Lib_Icudata;
Dir = SCP2_OOO_LIB_DIR;
#ifndef AIX
Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR));
#else
Name = "libicudata.so";
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icui18n
FileID = gid_File_Lib_Icui18n;
Dir = SCP2_OOO_LIB_DIR;
#ifndef AIX
Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR));
#else
Name = "libicui18n.so";
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icuuc
FileID = gid_File_Lib_Icuuc;
Dir = SCP2_OOO_LIB_DIR;
#ifndef AIX
Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR));
#else
Name = "libicuuc.so";
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
#endif
#endif
#ifdef MACOSX #ifdef MACOSX
#ifdef ENABLE_JAVA #ifdef ENABLE_JAVA