diff options
| author | Khaled Hosny <khaled@aliftype.com> | 2022-10-01 13:03:11 +0200 |
|---|---|---|
| committer | خالد حسني <khaled@aliftype.com> | 2022-10-01 14:21:28 +0200 |
| commit | 5aad191eae5366c6892dc51b85171bbe3db7b60d (patch) | |
| tree | 937d944d505bce9cf28157b30ef93ba78ab8a534 /RepositoryExternal.mk | |
| parent | b7e7ae77f55e41dae2231b04062cf037f7f9b13f (diff) | |
Revert "Use libo_CHECK_SYSTEM_MODULE for eot"
This reverts commit ce54ba96f38b4af3aab1a7064078ee406eb021c6 and the
followup commit 88c511981e31c73dced95b5dc3c200fdf2a4e932.
Both effectively disabled enabling libeot support.
See also: https://lists.freedesktop.org/archives/libreoffice/2022-August/089205.html
Change-Id: I54780c69ca83b230b0c9b3b18065782fb5626da6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140838
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: René Engelhard <rene@debian.org>
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@aliftype.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 30463ee56beb..025909c36945 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3330,9 +3330,9 @@ endif # MSC endif # SYSTEM_LIBORCUS +ifeq ($(ENABLE_EOT),TRUE) -ifeq ($(ENABLE_LIBEOT),TRUE) -ifeq ($(SYSTEM_LIBEOT),TRUE) +ifneq ($(SYSTEM_LIBEOT),) define gb_LinkTarget__use_libeot $(call gb_LinkTarget_set_include,$(1),\ @@ -3364,14 +3364,16 @@ $(call gb_ExternalProject_use_external_project,$(1),libeot) endef -endif # !SYSTEM_LIBEOT -else # !ENABLE_LIBEOT +endif # SYSTEM_LIBEOT + +else # !ENABLE_EOT gb_LinkTarget__use_libeot := gb_ExternalProject__use_libeot := -endif # !ENABLE_LIBEOT +endif # ENABLE_EOT +### X11 stuff ### ifeq ($(USING_X11), TRUE) |