[Libreoffice-commits] core.git: icu/ExternalPackage_icu.mk scp2/InstallModule_ooo.mk scp2/source

[Stephan Bergmann]

 icu/ExternalPackage_icu.mk           |    4 ---
 scp2/InstallModule_ooo.mk            |    1 
 scp2/source/ooo/file_library_ooo.scp |    6 ++---
 scp2/source/ooo/shortcut_ooo.scp     |   40 -----------------------------------
 4 files changed, 3 insertions(+), 48 deletions(-)

New commits:
commit e486f1612d814cf4255e9fc27e722c123d953809
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 2 23:08:19 2013 +0200

    No need to install non-SONAME versions of icu libs
    
    Change-Id: Ica8057c70f5e4b63830c6ffe7fb85269a10b845f

diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk
index cb2dc8c..4af02f5 100644
--- a/icu/ExternalPackage_icu.mk
+++ b/icu/ExternalPackage_icu.mk
@@ -66,16 +66,12 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\
 	source/lib/libicutulo.so \
 ))
 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_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_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_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),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)))
 
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index b21e7a2..51a5066 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -114,7 +114,6 @@ endif
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	-DICU_MAJOR=$(ICU_MAJOR) \
-	-DICU_MINOR=$(ICU_MINOR) \
 ))
 
 ifneq ($(SYSTEM_LIBXSLT),YES)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 417846c..b5ff166 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -196,7 +196,7 @@ End
 File gid_File_Lib_Icudata
     PACKED_LIB_FILE_BODY;
   #ifdef UNX
-    Name = STRING(CONCAT6(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR));
+    Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR));
   #else
   #ifdef MSVC_PKG_DEBUG_RUNTIME
     Name = STRING(CONCAT3(icudtd,ICU_MAJOR,.dll));
@@ -209,7 +209,7 @@ End
 File gid_File_Lib_Icui18n
     PACKED_LIB_FILE_BODY;
   #ifdef UNX
-    Name = STRING(CONCAT6(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR));
+    Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR));
   #else
   #ifdef MSVC_PKG_DEBUG_RUNTIME
     Name = STRING(CONCAT3(icuind,ICU_MAJOR,.dll));
@@ -222,7 +222,7 @@ End
 File gid_File_Lib_Icuuc
     PACKED_LIB_FILE_BODY;
   #ifdef UNX
-    Name = STRING(CONCAT6(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR));
+    Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR));
   #else
   #ifdef MSVC_PKG_DEBUG_RUNTIME
     Name = STRING(CONCAT3(icuucd,ICU_MAJOR,.dll));
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 7a204df..1515de3 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -18,46 +18,6 @@
 
 #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 ENABLE_JAVA