diff options
| -rw-r--r-- | RepositoryModule_build.mk | 1 | ||||
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/libxslt/ExternalPackage_xslt.mk (renamed from libxslt/ExternalPackage_xslt.mk) | 0 | ||||
| -rw-r--r-- | external/libxslt/ExternalProject_xslt.mk (renamed from libxslt/ExternalProject_xslt.mk) | 0 | ||||
| -rw-r--r-- | external/libxslt/Makefile (renamed from libxslt/Makefile) | 2 | ||||
| -rw-r--r-- | external/libxslt/Module_libxslt.mk (renamed from libxslt/Module_libxslt.mk) | 4 | ||||
| -rw-r--r-- | external/libxslt/README (renamed from libxslt/README) | 0 | ||||
| -rw-r--r-- | external/libxslt/UnpackedTarball_xslt.mk (renamed from libxslt/UnpackedTarball_xslt.mk) | 16 | ||||
| -rw-r--r-- | external/libxslt/libxslt-1.1.26-memdump.patch (renamed from libxslt/libxslt-1.1.26-memdump.patch) | 0 | ||||
| -rw-r--r-- | external/libxslt/libxslt-aix.patch (renamed from libxslt/libxslt-aix.patch) | 0 | ||||
| -rw-r--r-- | external/libxslt/libxslt-android.patch (renamed from libxslt/libxslt-android.patch) | 0 | ||||
| -rw-r--r-- | external/libxslt/libxslt-configure.patch (renamed from libxslt/libxslt-configure.patch) | 0 | ||||
| -rw-r--r-- | external/libxslt/libxslt-internal-symbols.patch (renamed from libxslt/libxslt-internal-symbols.patch) | 0 | ||||
| -rw-r--r-- | external/libxslt/libxslt-mingw.patch (renamed from libxslt/libxslt-mingw.patch) | 0 | ||||
| -rw-r--r-- | external/libxslt/libxslt-vc10.patch (renamed from libxslt/libxslt-vc10.patch) | 0 | ||||
| -rw-r--r-- | external/libxslt/libxslt-win_manifest.patch (renamed from libxslt/libxslt-win_manifest.patch) | 0 |
17 files changed, 10 insertions, 15 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 520f186ce078..926aca78ef4b 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ helpcompiler \ xmlhelp \ ) \ - $(call gb_Helper_optional,LIBXSLT,libxslt) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ $(call gb_Helper_optional,UCPP,ucpp) \ $(call gb_Helper_optional,ZLIB,zlib) \ diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index a23db02023eb..2d3be85e1c1f 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -72,7 +72,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ librelogo \ libxmlsec \ - $(call gb_Helper_optional,LIBXSLT,libxslt) \ lingucomponent \ linguistic \ lotuswordpro \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 378e1aca4637..ec88b2d84e36 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,LIBPNG,libpng) \ $(call gb_Helper_optional,LIBXML2,libxml2) \ + $(call gb_Helper_optional,LIBXSLT,libxslt) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ diff --git a/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index c9586b8c1178..c9586b8c1178 100644 --- a/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk diff --git a/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk index fa1377093770..fa1377093770 100644 --- a/libxslt/ExternalProject_xslt.mk +++ b/external/libxslt/ExternalProject_xslt.mk diff --git a/libxslt/Makefile b/external/libxslt/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/libxslt/Makefile +++ b/external/libxslt/Makefile @@ -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: diff --git a/libxslt/Module_libxslt.mk b/external/libxslt/Module_libxslt.mk index b43a224ba0aa..6a88fe20e229 100644 --- a/libxslt/Module_libxslt.mk +++ b/external/libxslt/Module_libxslt.mk @@ -9,14 +9,10 @@ $(eval $(call gb_Module_Module,libxslt)) -ifeq ($(SYSTEM_LIBXSLT),NO) - $(eval $(call gb_Module_add_targets,libxslt,\ ExternalPackage_xslt \ ExternalProject_xslt \ UnpackedTarball_xslt \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/libxslt/README b/external/libxslt/README index dd69a9d732c3..dd69a9d732c3 100644 --- a/libxslt/README +++ b/external/libxslt/README diff --git a/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk index dad41d8487f4..b6b20b5136a8 100644 --- a/libxslt/UnpackedTarball_xslt.mk +++ b/external/libxslt/UnpackedTarball_xslt.mk @@ -12,14 +12,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xslt)) $(eval $(call gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,xslt,\ - libxslt/libxslt-configure.patch \ - libxslt/libxslt-win_manifest.patch \ - libxslt/libxslt-mingw.patch \ - libxslt/libxslt-internal-symbols.patch \ - libxslt/libxslt-aix.patch \ - libxslt/libxslt-vc10.patch \ - libxslt/libxslt-1.1.26-memdump.patch \ - $(if $(filter ANDROID,$(OS)),libxslt/libxslt-android.patch) \ + external/libxslt/libxslt-configure.patch \ + external/libxslt/libxslt-win_manifest.patch \ + external/libxslt/libxslt-mingw.patch \ + external/libxslt/libxslt-internal-symbols.patch \ + external/libxslt/libxslt-aix.patch \ + external/libxslt/libxslt-vc10.patch \ + external/libxslt/libxslt-1.1.26-memdump.patch \ + $(if $(filter ANDROID,$(OS)),external/libxslt/libxslt-android.patch) \ )) # vim: set noet sw=4 ts=4: diff --git a/libxslt/libxslt-1.1.26-memdump.patch b/external/libxslt/libxslt-1.1.26-memdump.patch index 28724f749a38..28724f749a38 100644 --- a/libxslt/libxslt-1.1.26-memdump.patch +++ b/external/libxslt/libxslt-1.1.26-memdump.patch diff --git a/libxslt/libxslt-aix.patch b/external/libxslt/libxslt-aix.patch index fe38f7bb7e73..fe38f7bb7e73 100644 --- a/libxslt/libxslt-aix.patch +++ b/external/libxslt/libxslt-aix.patch diff --git a/libxslt/libxslt-android.patch b/external/libxslt/libxslt-android.patch index 68069d6e9457..68069d6e9457 100644 --- a/libxslt/libxslt-android.patch +++ b/external/libxslt/libxslt-android.patch diff --git a/libxslt/libxslt-configure.patch b/external/libxslt/libxslt-configure.patch index 6b189df5aa0d..6b189df5aa0d 100644 --- a/libxslt/libxslt-configure.patch +++ b/external/libxslt/libxslt-configure.patch diff --git a/libxslt/libxslt-internal-symbols.patch b/external/libxslt/libxslt-internal-symbols.patch index 813c34f0386a..813c34f0386a 100644 --- a/libxslt/libxslt-internal-symbols.patch +++ b/external/libxslt/libxslt-internal-symbols.patch diff --git a/libxslt/libxslt-mingw.patch b/external/libxslt/libxslt-mingw.patch index da8eee3b1098..da8eee3b1098 100644 --- a/libxslt/libxslt-mingw.patch +++ b/external/libxslt/libxslt-mingw.patch diff --git a/libxslt/libxslt-vc10.patch b/external/libxslt/libxslt-vc10.patch index b50f0abe2e80..b50f0abe2e80 100644 --- a/libxslt/libxslt-vc10.patch +++ b/external/libxslt/libxslt-vc10.patch diff --git a/libxslt/libxslt-win_manifest.patch b/external/libxslt/libxslt-win_manifest.patch index 43c14eb70b8b..43c14eb70b8b 100644 --- a/libxslt/libxslt-win_manifest.patch +++ b/external/libxslt/libxslt-win_manifest.patch |