summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--RepositoryExternal.mk12
-rwxr-xr-xbin/lo-all-static-libs2
-rw-r--r--configure.ac6
-rw-r--r--external/liblangtag/ExternalProject_liblangtag.mk2
-rw-r--r--external/libxml2/ExternalPackage_libxml2.mk28
-rw-r--r--external/libxml2/ExternalPackage_xml2.mk28
-rw-r--r--external/libxml2/ExternalProject_libxml2.mk (renamed from external/libxml2/ExternalProject_xml2.mk)10
-rw-r--r--external/libxml2/Module_libxml2.mk6
-rw-r--r--external/libxml2/UnpackedTarball_libxml2.mk (renamed from external/libxml2/UnpackedTarball_xml2.mk)6
-rw-r--r--external/libxml2/libxml2-config.patch.18
-rw-r--r--external/libxmlsec/ExternalProject_xmlsec.mk2
-rw-r--r--external/libxmlsec/xmlsec1-vc.patch.12
-rw-r--r--external/libxslt/ExternalProject_xslt.mk4
-rw-r--r--external/libxslt/libxslt-msvc.patch.22
-rw-r--r--external/redland/ExternalProject_raptor.mk2
-rw-r--r--external/redland/ExternalProject_rasqal.mk2
16 files changed, 61 insertions, 61 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 22dcc802aeaa..4b90a1e2d979 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -822,11 +822,11 @@ gb_ExternalProject__use_libxml2:=
else # !SYSTEM_LIBXML
$(eval $(call gb_Helper_register_packages_for_install,ure,\
- xml2 \
+ libxml2 \
))
define gb_LinkTarget__use_libxml2
-$(call gb_LinkTarget_use_package,$(1),xml2)
+$(call gb_LinkTarget_use_package,$(1),libxml2)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(LIBXML_CFLAGS) \
@@ -842,7 +842,7 @@ endif
endef
define gb_ExternalProject__use_libxml2
-$(call gb_ExternalProject_use_package,$(1),xml2)
+$(call gb_ExternalProject_use_package,$(1),libxml2)
ifeq ($(COM),MSC)
$(call gb_ExternalProject_use_external_project,$(1),icu)
@@ -3908,10 +3908,10 @@ gb_ExternalExecutable__register_xmllint :=
else # ! SYSTEM_LIBXML_FOR_BUILD
define gb_ExternalExecutable__register_xmllint
-$(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),xml2)
+$(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/libxml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),libxml2)
$(call gb_ExternalExecutable_add_dependencies,xmllint,\
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
- $(call gb_Package_get_target,xml2) \
+ $(call gb_Package_get_target,libxml2) \
)
endef
@@ -3928,7 +3928,7 @@ define gb_ExternalExecutable__register_xsltproc
$(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt)
$(call gb_ExternalExecutable_add_dependencies,xsltproc,\
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
- $(call gb_Package_get_target,xml2) \
+ $(call gb_Package_get_target,libxml2) \
$(call gb_Package_get_target,xslt) \
)
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 4efe49e5e4a3..1a2f94214c48 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -81,5 +81,5 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
$WORKDIR/UnpackedTarball/raptor/src/.libs/*.a \
$WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \
$WORKDIR/UnpackedTarball/redland/src/.libs/*.a \
- $WORKDIR/UnpackedTarball/xml2/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libxml2/.libs/*.a \
$WORKDIR/UnpackedTarball/xslt/libxslt/.libs/*.a
diff --git a/configure.ac b/configure.ac
index e5132ec4c034..4c84aa0a008e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7907,14 +7907,14 @@ if test "$with_system_libxml" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXML=
- LIBXML_CFLAGS="-I${WORKDIR}/UnpackedTarball/xml2/include"
+ LIBXML_CFLAGS="-I${WORKDIR}/UnpackedTarball/libxml2/include"
if test "$COM" = "MSC"; then
LIBXML_CFLAGS="${LIBXML_CFLAGS} -I${WORKDIR}/UnpackedTarball/icu/source/i18n -I${WORKDIR}/UnpackedTarball/icu/source/common"
fi
if test "$COM" = "MSC"; then
- LIBXML_LIBS="${WORKDIR}/UnpackedTarball/xml2/win32/bin.msvc/libxml2.lib"
+ LIBXML_LIBS="${WORKDIR}/UnpackedTarball/libxml2/win32/bin.msvc/libxml2.lib"
else
- LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/xml2/.libs -lxml2"
+ LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/libxml2/.libs -lxml2"
fi
BUILD_TYPE="$BUILD_TYPE LIBXML2"
fi
diff --git a/external/liblangtag/ExternalProject_liblangtag.mk b/external/liblangtag/ExternalProject_liblangtag.mk
index 8b5e868ed7bb..a2c3cbf39b59 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
- LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
+ LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN) \
$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN) \
diff --git a/external/libxml2/ExternalPackage_libxml2.mk b/external/libxml2/ExternalPackage_libxml2.mk
new file mode 100644
index 000000000000..c5b43ba31fbe
--- /dev/null
+++ b/external/libxml2/ExternalPackage_libxml2.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,libxml2,libxml2))
+
+$(eval $(call gb_ExternalPackage_use_external_project,libxml2,libxml2))
+
+ifneq ($(DISABLE_DYNLOADING),TRUE)
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.2.dylib,.libs/libxml2.2.dylib))
+else ifeq ($(OS),WNT)
+ifeq ($(COM),GCC)
+$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll))
+else # COM=MSC
+$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
+endif
+else # OS!=WNT
+$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.5))
+endif
+endif # DISABLE_DYNLOADING
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk
deleted file mode 100644
index 28804bc953f4..000000000000
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,xml2,xml2))
-
-$(eval $(call gb_ExternalPackage_use_external_project,xml2,xml2))
-
-ifneq ($(DISABLE_DYNLOADING),TRUE)
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.2.dylib,.libs/libxml2.2.dylib))
-else ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll))
-else # COM=MSC
-$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
-endif
-else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.5))
-endif
-endif # DISABLE_DYNLOADING
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_libxml2.mk
index f60d960d6790..c27efdf36b72 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_libxml2.mk
@@ -7,16 +7,16 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,xml2))
+$(eval $(call gb_ExternalProject_ExternalProject,libxml2))
-$(eval $(call gb_ExternalProject_register_targets,xml2,\
+$(eval $(call gb_ExternalProject_register_targets,libxml2,\
build \
))
ifeq ($(OS),WNT)
-$(call gb_ExternalProject_use_external_project,xml2,icu)
+$(call gb_ExternalProject_use_external_project,libxml2,icu)
-$(call gb_ExternalProject_get_state_target,xml2,build):
+$(call gb_ExternalProject_get_state_target,libxml2,build):
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
&& LIB="$(ILIB)" nmake \
,win32)
else # OS!=WNT
-$(call gb_ExternalProject_get_state_target,xml2,build):
+$(call gb_ExternalProject_get_state_target,libxml2,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \
--without-lzma \
diff --git a/external/libxml2/Module_libxml2.mk b/external/libxml2/Module_libxml2.mk
index f6bca3f80e4f..31a90fadd0c2 100644
--- a/external/libxml2/Module_libxml2.mk
+++ b/external/libxml2/Module_libxml2.mk
@@ -10,9 +10,9 @@
$(eval $(call gb_Module_Module,libxml2))
$(eval $(call gb_Module_add_targets,libxml2,\
- ExternalPackage_xml2 \
- ExternalProject_xml2 \
- UnpackedTarball_xml2 \
+ ExternalPackage_libxml2 \
+ ExternalProject_libxml2 \
+ UnpackedTarball_libxml2 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/UnpackedTarball_xml2.mk b/external/libxml2/UnpackedTarball_libxml2.mk
index 9864c3c4d726..3842d6ca68f9 100644
--- a/external/libxml2/UnpackedTarball_xml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -7,11 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,xml2))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libxml2))
-$(eval $(call gb_UnpackedTarball_set_tarball,xml2,$(LIBXML_TARBALL),,libxml2))
+$(eval $(call gb_UnpackedTarball_set_tarball,libxml2,$(LIBXML_TARBALL),,libxml2))
-$(eval $(call gb_UnpackedTarball_add_patches,xml2,\
+$(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
external/libxml2/libxml2-config.patch.1 \
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
diff --git a/external/libxml2/libxml2-config.patch.1 b/external/libxml2/libxml2-config.patch.1
index 7b2b7f604188..7d96fb530e57 100644
--- a/external/libxml2/libxml2-config.patch.1
+++ b/external/libxml2/libxml2-config.patch.1
@@ -14,10 +14,10 @@ Hack the xml2-config to return paths into WORKDIR.
+#includedir=@includedir@
+#libdir=@libdir@
+
-+prefix=${WORKDIR}/UnpackedTarball/xml2
-+exec_prefix=${WORKDIR}/UnpackedTarball/xml2
-+includedir=${WORKDIR}/UnpackedTarball/xml2/include
-+libdir=${WORKDIR}/UnpackedTarball/xml2/.libs
++prefix=${WORKDIR}/UnpackedTarball/libxml2
++exec_prefix=${WORKDIR}/UnpackedTarball/libxml2
++includedir=${WORKDIR}/UnpackedTarball/libxml2/include
++libdir=${WORKDIR}/UnpackedTarball/libxml2/.libs
usage()
{
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index 6a01b893aa29..a40e9a0b10ee 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -22,7 +22,7 @@ ifeq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js crypto=mscrypto xslt=no iconv=no static=no \
- lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \
+ lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
&& unset MAKEFLAGS \
&& LIB="$(ILIB)" nmake \
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/libxmlsec/xmlsec1-vc.patch.1
index bfd130503f45..f84371abb8eb 100644
--- a/external/libxmlsec/xmlsec1-vc.patch.1
+++ b/external/libxmlsec/xmlsec1-vc.patch.1
@@ -17,7 +17,7 @@ index 8156caa7..ef1909ce 100644
CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H"
CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H"
CFLAGS = $(CFLAGS) /D "XMLSEC_NO_GOST" /D "XMLSEC_NO_GOST2012"
-+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
++CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
+!if "$(MSVC_USE_DEBUG_RUNTIME)" != ""
+CFLAGS = $(CFLAGS) /MDd
+!endif
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index 02c239b069ee..0dafc9109834 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
cscript /e:javascript configure.js \
$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
vcmanifest=yes \
- lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \
+ lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
&& unset MAKEFLAGS \
&& LIB="$(ILIB)" nmake \
,win32)
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
$(if $(filter IOS,$(OS)),LIBS="-liconv") \
--disable-shared,--disable-static) \
- $(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \
+ $(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,libxml2)) \
&& chmod 777 xslt-config \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),\
diff --git a/external/libxslt/libxslt-msvc.patch.2 b/external/libxslt/libxslt-msvc.patch.2
index 07e5dce578d8..cc2d2c14f99e 100644
--- a/external/libxslt/libxslt-msvc.patch.2
+++ b/external/libxslt/libxslt-msvc.patch.2
@@ -4,7 +4,7 @@
CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT"
CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
-+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
++CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
# The linker and its options.
LD = link.exe
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
index 70e28edf99b8..88efb3350aee 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/external/redland/ExternalProject_raptor.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
, \
--enable-shared --disable-static \
) \
- $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+ $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \
&& $(MAKE) \
)
diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
index 2d9393e14a34..c55111ef9fea 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/external/redland/ExternalProject_rasqal.mk
@@ -42,7 +42,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
, \
--enable-shared --disable-static \
) \
- $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+ $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 10:34:50 +0000