Kaydet (Commit) f2b51cdf authored tarafından Khaled Hosny's avatar Khaled Hosny Kaydeden (comit) David Tardon

fdo#70393: move libxml2 to a subdir of external

Change-Id: Ifea928fc56239043f976ed1e0d2c986bc5cfb934
Reviewed-on: https://gerrit.libreoffice.org/6339Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 27d0ddf6
......@@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
helpcompiler \
xmlhelp \
) \
$(call gb_Helper_optional,LIBXML2,libxml2) \
$(call gb_Helper_optional,LIBXSLT,libxslt) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
$(call gb_Helper_optional,UCPP,ucpp) \
......
......@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
jvmfwk \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
librelogo \
$(call gb_Helper_optional,LIBXML2,libxml2) \
libxmlsec \
$(call gb_Helper_optional,LIBXSLT,libxslt) \
lingucomponent \
......
......@@ -46,6 +46,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
$(call gb_Helper_optional,LIBPNG,libpng) \
$(call gb_Helper_optional,LIBXML2,libxml2) \
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
......
......@@ -2,6 +2,6 @@
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(module_directory)/../solenv/gbuild/partial_build.mk
include $(module_directory)/../../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:
......@@ -9,14 +9,10 @@
$(eval $(call gb_Module_Module,libxml2))
ifeq ($(SYSTEM_LIBXML),NO)
$(eval $(call gb_Module_add_targets,libxml2,\
ExternalPackage_xml2 \
ExternalProject_xml2 \
UnpackedTarball_xml2 \
))
endif
# vim: set noet sw=4 ts=4:
......@@ -12,16 +12,16 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xml2))
$(eval $(call gb_UnpackedTarball_set_tarball,xml2,$(LIBXML_TARBALL),,libxml2))
$(eval $(call gb_UnpackedTarball_add_patches,xml2,\
libxml2/libxml2-configure.patch \
libxml2/libxml2-gnome599717.patch \
libxml2/libxml2-xpath.patch \
libxml2/libxml2-global-symbols.patch \
libxml2/libxml2-aix.patch \
libxml2/libxml2-vc10.patch \
libxml2/libxml2-latin.patch \
$(if $(filter ANDROID,$(OS)),libxml2/libxml2-android.patch) \
$(if $(filter WNT,$(OS)),libxml2/libxml2-long-path.patch \
$(if $(filter GCC,$(COM)),libxml2/libxml2-mingw.patch)) \
external/libxml2/libxml2-configure.patch \
external/libxml2/libxml2-gnome599717.patch \
external/libxml2/libxml2-xpath.patch \
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-aix.patch \
external/libxml2/libxml2-vc10.patch \
external/libxml2/libxml2-latin.patch \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
$(if $(filter WNT,$(OS)),external/libxml2/libxml2-long-path.patch \
$(if $(filter GCC,$(COM)),external/libxml2/libxml2-mingw.patch)) \
))
# vim: set noet sw=4 ts=4:
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