diff options
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/mdds/0001-Workaround-for-an-old-gcc-bug.patch (renamed from mdds/0001-Workaround-for-an-old-gcc-bug.patch) | 0 | ||||
| -rw-r--r-- | external/mdds/Makefile (renamed from mdds/Makefile) | 2 | ||||
| -rw-r--r-- | external/mdds/Module_mdds.mk (renamed from mdds/Module_mdds.mk) | 4 | ||||
| -rw-r--r-- | external/mdds/README (renamed from mdds/README) | 0 | ||||
| -rw-r--r-- | external/mdds/UnpackedTarball_mdds.mk (renamed from mdds/UnpackedTarball_mdds.mk) | 4 | ||||
| -rw-r--r-- | external/mdds/mdds_0.6.0.patch (renamed from mdds/mdds_0.6.0.patch) | 0 |
8 files changed, 4 insertions, 8 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 99b24e1342dd..5c337309c7a7 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ linguistic \ lotuswordpro \ $(call gb_Helper_optional,DESKTOP,l10ntools) \ - $(call gb_Helper_optional,MDDS,mdds) \ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ $(call gb_Helper_optional,MOZ,moz) \ $(call gb_Helper_optional,MARIADBC,mysqlc) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 988d477897d3..f4abc76b5f9d 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LIBXSLT,libxslt) \ $(call gb_Helper_optional,LPSOLVE,lpsolve) \ $(call gb_Helper_optional,MARIADB,libmariadb) \ + $(call gb_Helper_optional,MDDS,mdds) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ diff --git a/mdds/0001-Workaround-for-an-old-gcc-bug.patch b/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch index 8529fbfc2adf..8529fbfc2adf 100644 --- a/mdds/0001-Workaround-for-an-old-gcc-bug.patch +++ b/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch diff --git a/mdds/Makefile b/external/mdds/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/mdds/Makefile +++ b/external/mdds/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/mdds/Module_mdds.mk b/external/mdds/Module_mdds.mk index ac0f8a649d7e..47745940bf90 100644 --- a/mdds/Module_mdds.mk +++ b/external/mdds/Module_mdds.mk @@ -9,12 +9,8 @@ $(eval $(call gb_Module_Module,mdds)) -ifeq ($(SYSTEM_MDDS),NO) - $(eval $(call gb_Module_add_targets,mdds,\ UnpackedTarball_mdds \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/mdds/README b/external/mdds/README index bd635eee39f3..bd635eee39f3 100644 --- a/mdds/README +++ b/external/mdds/README diff --git a/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk index 69fbf189cb46..1ccfc2a85f3d 100644 --- a/mdds/UnpackedTarball_mdds.mk +++ b/external/mdds/UnpackedTarball_mdds.mk @@ -14,8 +14,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ - mdds/mdds_0.6.0.patch \ - mdds/0001-Workaround-for-an-old-gcc-bug.patch \ + external/mdds/mdds_0.6.0.patch \ + external/mdds/0001-Workaround-for-an-old-gcc-bug.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/mdds/mdds_0.6.0.patch b/external/mdds/mdds_0.6.0.patch index fba150267329..fba150267329 100644 --- a/mdds/mdds_0.6.0.patch +++ b/external/mdds/mdds_0.6.0.patch |