diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-13 19:36:48 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-14 12:29:46 +0100 |
| commit | f921e2609a44b983866fd07f2240fa4dd0f23dfc (patch) | |
| tree | 5255f7766555b575414fde62bab40cee05190512 | |
| parent | scp2: move redland libraries to AutoInstall (diff) | |
| download | core-f921e2609a44b983866fd07f2240fa4dd0f23dfc.tar.gz core-f921e2609a44b983866fd07f2240fa4dd0f23dfc.zip | |
scp2: move openssl to AutoInstall
Change-Id: Iab04734140feb293e3d975234da2f727fa58e754
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 19 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 4 |
3 files changed, 5 insertions, 22 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 89582867c409..3455170e0e04 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1462,6 +1462,10 @@ endef else # !SYSTEM_OPENSSL +$(eval $(call gb_Helper_register_packages_for_install,ooo, \ + openssl \ +)) + define gb_ExternalProject__use_openssl $(call gb_ExternalProject_use_package,$(1),openssl) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 7c6aa29aa04c..046741c04aae 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -232,25 +232,6 @@ End #endif #endif -#ifndef SYSTEM_OPENSSL -File gid_File_Lib_Openssl - PACKED_LIB_FILE_BODY; - #ifdef WNT - Name = "ssleay32.dll"; - #endif -End -#endif - -#ifndef SYSTEM_OPENSSL -File gid_File_Lib_Crypto - PACKED_LIB_FILE_BODY; - - #ifdef WNT - Name = "libeay32.dll"; - #endif -End -#endif - #if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and // gid_Brand_File_Lib_Msvcr80 diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 9d6c5952cc5d..49d883f835bc 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -155,12 +155,10 @@ Module gid_Module_Root_Files_5 Sortkey = "1500"; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Lib_Crypto, - gid_Unixlink_File_Lib_Curl, + Files = (gid_Unixlink_File_Lib_Curl, gid_File_Lib_Icudata, gid_File_Lib_Icui18n, gid_File_Lib_Icuuc, - gid_File_Lib_Openssl, gid_File_Lib_Recentfile, gid_File_Lib_Tab, gid_File_Lib_Tab2, |