Kaydet (Commit) f921e260 authored tarafından Michael Stahl's avatar Michael Stahl

scp2: move openssl to AutoInstall

Change-Id: Iab04734140feb293e3d975234da2f727fa58e754
üst 5ae30d3a
......@@ -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)
......
......@@ -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
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment