summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.in17
-rw-r--r--distro-configs/LibreOfficeAndroid.conf1
-rw-r--r--distro-configs/LibreOfficeAndroidX86.conf1
-rw-r--r--distro-configs/LibreOfficeiOS.conf1
-rw-r--r--libxmlsec/makefile.mk4
-rw-r--r--nss/makefile.mk7
-rw-r--r--postprocess/packcomponents/makefile.mk4
-rw-r--r--sc/CppunitTest_sc_subsequent_filters_test.mk2
-rw-r--r--scp2/InstallModule_ooo.mk1
-rw-r--r--scp2/source/ooo/file_library_ooo.scp31
-rw-r--r--tail_build/prj/build.lst2
-rw-r--r--xmlsecurity/Module_xmlsecurity.mk4
-rw-r--r--xmlsecurity/prj/build.lst2
14 files changed, 30 insertions, 48 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index 717383b8c72e..7289d55a3110 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -150,7 +150,6 @@ export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@
export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@
-export ENABLE_XMLSEC=@ENABLE_XMLSEC@
export ENABLE_ZENITY=@ENABLE_ZENITY@
export EPM=@EPM@
export EPM_FLAGS=@EPM_FLAGS@
diff --git a/configure.in b/configure.in
index fc14552b78a2..95bd0dbba294 100644
--- a/configure.in
+++ b/configure.in
@@ -850,12 +850,6 @@ AC_ARG_ENABLE(build-mozilla,
the Mozilla source code but take precompiled zips.]),
,)
-AC_ARG_ENABLE(xmlsec,
- AS_HELP_STRING([--disable-xmlsec],
- [Whether to enable XMLsec for open document signing. Be warned,
- building without XML Security will likely give you test failures.]),
-)
-
AC_ARG_ENABLE(tde,
AS_HELP_STRING([--enable-tde],
[Determines whether to use TQt/TDE vclplug on platforms where TQt and
@@ -7710,17 +7704,6 @@ else
AC_MSG_RESULT([yes])
fi
-AC_MSG_CHECKING([whether to build XML Security support])
-if test "$enable_xmlsec" = "no"; then
- AC_MSG_RESULT([no])
- ENABLE_XMLSEC=
-else
- ENABLE_XMLSEC="YES"
- BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
- AC_MSG_RESULT([yes])
-fi
-AC_SUBST(ENABLE_XMLSEC)
-
dnl ===================================================================
dnl Check for system openldap
dnl ===================================================================
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index aac1da7de580..01f11ca5e47a 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -17,7 +17,6 @@
--disable-randr
--disable-randr-link
--disable-systray
---disable-xmlsec
--enable-mergelibs
--without-junit
--without-ppds
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index a60fec7eeeca..a3662d6fc96a 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -18,7 +18,6 @@
--disable-randr
--disable-randr-link
--disable-systray
---disable-xmlsec
--enable-mergelibs
--without-junit
--without-ppds
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 67afb67433c6..89e88ed80be3 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -20,7 +20,6 @@
--disable-randr-link
--disable-systray
--disable-vba
---disable-xmlsec
--without-afms
--without-fonts
--without-java
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 14705033bebe..18c46fb5ac40 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -35,9 +35,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
-.IF "$(ENABLE_XMLSEC)" != "YES"
+.IF "$(OS)" == "ANDROID" || "$(OS)" == "IOS"
@all:
- @echo "XMLSec module disabled"
+ @echo "FIXME: XMLSec module not buildable yet on this platform"
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 505bcfdd1e14..8603fbb796ae 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -39,7 +39,12 @@ TARGET=nss
.IF "$(SYSTEM_NSS)"=="YES"
all:
@echo "NSS will not be built. Using system one instead."
-.ENDIF
+.ENDIF
+
+.IF "$(OS)" == "ANDROID" || "$(OS)" == "IOS"
+@all:
+ @echo "FIXME: NSS module not buildable yet on this platform"
+.ENDIF
VER_MAJOR=3
VER_MINOR=13
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index eb5574b642ec..a5f2f81d7db4 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -313,13 +313,11 @@ my_components += \
my_components += component/extensions/source/plugin/pl
.END
-.IF "$(ENABLE_XMLSEC)" == "YES"
.IF "$(OS)" == "WNT"
my_components += component/xmlsecurity/util/xsec_xmlsec.windows
-.ELSE
+.ELIF "$(OS)" != "ANDROID" && "$(OS)" != "IOS" #FIXME, get nss&xmlsec building
my_components += component/xmlsecurity/util/xsec_xmlsec
.END
-.END
.IF "$(OS)" == "MACOSX"
my_components += \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 608fd66c4f25..eb53f5c86079 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -119,12 +119,12 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xmlsecurity \
))
-ifeq ($(ENABLE_XMLSEC),YES)
ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec.windows \
))
else
+ifneq ($(filter-out IOS ANDROID,$(OS)),) #FIXME: get nss&xmlsec building
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec \
))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 4dff0df7bca5..97a007de666e 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_ONLINE_UPDATE \
ENABLE_OPENGL \
ENABLE_TELEPATHY \
- ENABLE_XMLSEC \
MERGELIBS \
SYSTEM_BOOST \
SYSTEM_CAIRO \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 71979861dbc8..de2c541ab4ec 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1342,8 +1342,8 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#endif
#endif
-//we need the nss libs of libxmlsec is enabled, or if the internal mozilla is enabled
-#if defined(ENABLE_XMLSEC) || !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
+#if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building
+//we need the nss libs for libxmlsec (or if the internal mozilla is enabled)
#ifndef SYSTEM_NSS
SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3)
SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3)
@@ -1374,7 +1374,19 @@ End
#endif //WNT
SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
#endif //SYSTEM_NSS
-#endif //defined(ENABLE_XMLSEC) || !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
+
+File gid_File_Lib_XSec_XmlSec
+ LIB_FILE_BODY;
+ #ifdef UNX
+ Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
+ #else
+ Name = "xsec_xmlsec.dll";
+ #endif
+ Dir = SCP2_OOO_BIN_DIR;
+ Styles = (PACKED);
+End
+
+#endif
SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
@@ -1508,18 +1520,6 @@ File gid_File_Lib_XSec_Framework
Styles = (PACKED);
End
-#if defined(ENABLE_XMLSEC)
-File gid_File_Lib_XSec_XmlSec
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
- #else
- Name = "xsec_xmlsec.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
#ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore
LIB_FILE_BODY;
@@ -1543,7 +1543,6 @@ File gid_File_Lib_LibXMLSec_xmlsecmscrypto
Styles = (PACKED);
End
#endif
-#endif
File gid_File_Lib_Migrationoo2
LIB_FILE_BODY;
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 94617305f956..769a393930c0 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index ea5f5aa42059..46646b048a88 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -32,9 +32,11 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
AllLangResTarget_xsec \
Library_xmlsecurity \
Library_xsec_fw \
- $(if $(filter YES,$(ENABLE_XMLSEC)),Library_xsec_xmlsec) \
+ $(ifneq ($(filter-out IOS ANDROID,$(OS)),),Library_xsec_xmlsec) \
))
+#FIXME: ^^^, get nss&libxmlsec building on ios and android
+
# failing
#$(eval $(call gb_Module_add_check_targets,xmlsecurity,\
CppunitTest_qa_certext \
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index d70a6dbb9500..9dfe04cc5c81 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,2 +1,2 @@
-xs xmlsecurity : TRANSLATIONS:translations xmloff unotools offapi unoil svx LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL
+xs xmlsecurity : TRANSLATIONS:translations xmloff unotools offapi unoil svx libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL
xs xmlsecurity\prj nmake - all xs_prj NULL
generated by cgit (git 2.34.1) at 2024-09-17 08:10:56 +0000