strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scp2: move libxmlsec to AutoInstall

Browse source 
Change-Id: I3a1798c5b2a2d7117d0d5f761f19ab627ba6606a
This commit is contained in:
Michael Stahl 2014-03-13 19:43:27 +01:00
parent f921e2609a
commit 6cf0753c99
3 changed files with 4 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Repository.mk
View file

@ -705,6 +705,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
))
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
xmlsec \
))
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \

31
scp2/source/ooo/file_library_ooo.scp
View file

@ -201,37 +201,6 @@ End
#endif
#ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore
PACKED_LIB_FILE_BODY;
#ifdef _gcc3
Name = "libxmlsec1.dll";
#else
Name = "libxmlsec.dll";
#endif
End
#ifdef CROSS_COMPILING
File gid_File_Lib_LibXMLSec_xmlsecnss
PACKED_LIB_FILE_BODY;
#ifdef _gcc3
Name = "libxmlsec1-nss.dll";
#else
Name = "libxmlsec-nss.dll";
#endif
End
#else
File gid_File_Lib_LibXMLSec_xmlsecmscrypto
PACKED_LIB_FILE_BODY;
#ifdef _gcc3
Name = "libxmlsec1-mscrypto.dll";
#else
Name = "libxmlsec-mscrypto.dll";
#endif
End
#endif
#endif
#if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN
// see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
// gid_Brand_File_Lib_Msvcr80

3
scp2/source/ooo/module_hidden_ooo.scp
View file

@ -181,9 +181,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Neon,
gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt,
gid_File_Lib_LibXMLSec_xmlsecnss,
gid_File_Lib_LibXMLSec_xmlseccore,
gid_File_Lib_LibXMLSec_xmlsecmscrypto,
gid_File_Lib_XSec_XmlSec,
gid_File_Lib_I18n,
gid_File_Lib_Accessbridge,