RepositoryExternal.mk | 13 +++++++++++--
avmedia/Library_avmedia.mk | 2 --
chart2/Library_chartcore.mk | 7 +------
config_host.mk.in | 1 +
configure.ac | 1 +
cui/Library_cui.mk | 6 +-----
slideshow/Library_slideshow.mk | 6 +-----
svx/Library_svxcore.mk | 6 +-----
toolkit/Library_tk.mk | 6 +-----
vcl/CppunitTest_vcl_bitmap_test.mk | 6 +-----
vcl/CppunitTest_vcl_svm_test.mk | 7 +------
vcl/Library_vclplug_osx.mk | 7 +------
12 files changed, 21 insertions(+), 47 deletions(-)
New commits:
commit a6fae99466cd52143a52a98b0ac89588f679f1a1
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Wed Jan 5 11:49:19 2022 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Wed Jan 5 18:00:59 2022 +0100
Disable epoxy test with --disable-gui
Instead of always testing for DISABLE_GUI, just disable the epoxy
test and handle !ENABLE_EPOXY in RepositoryExternal.mk.
Change-Id: I38213ffa77353bc93f32caa1b4164c5fa88170ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127999
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7feb93cc150d..7262a0eaa7af 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -224,7 +224,9 @@ endef
endif # SYSTEM_CPPUNIT
-ifneq ($(SYSTEM_EPOXY),)
+
+ifeq ($(ENABLE_EPOXY),TRUE)
+ifeq ($(SYSTEM_EPOXY),TRUE)
define gb_LinkTarget__use_epoxy
$(call gb_LinkTarget_set_include,$(1),\
@@ -260,7 +262,14 @@ $(call gb_ExternalProject_use_external_project,$(1),epoxy)
endef
-endif # SYSTEM_EPOXY
+endif # !SYSTEM_EPOXY
+else # !ENABLE_EPOXY
+
+gb_LinkTarget__use_epoxy :=
+gb_ExternalProject__use_epoxy :=
+
+endif # !ENABLE_EPOXY
+
define gb_LinkTarget__use_iconv
ifeq ($(COM),MSC)
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index a337fa9cae73..72a5a67350e2 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -41,11 +41,9 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
ifneq (,$(filter AVMEDIA,$(BUILD_TYPE)))
-ifeq ($(DISABLE_GUI),)
$(eval $(call gb_Library_use_externals,avmedia,\
epoxy \
))
-endif
$(eval $(call
gb_Library_set_componentfile,avmedia,avmedia/util/avmedia,services))
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index f5069c7c5670..a9a23159b436 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -27,14 +27,9 @@ $(eval $(call
gb_Library_set_precompiled_header,chartcore,chart2/inc/pch/precomp
$(eval $(call gb_Library_use_externals,chartcore,\
boost_headers \
- libxml2 \
-))
-
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,chartcore,\
epoxy \
+ libxml2 \
))
-endif
$(eval $(call gb_Library_use_custom_headers,chartcore,\
officecfg/registry \
diff --git a/config_host.mk.in b/config_host.mk.in
index 6d2102dd47e6..f787994bd840 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -154,6 +154,7 @@ export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
export ENABLE_DBUS=@ENABLE_DBUS@
export ENABLE_DCONF=@ENABLE_DCONF@
export ENABLE_DEBUG=@ENABLE_DEBUG@
+export ENABLE_EPOXY=@ENABLE_EPOXY@
export ENABLE_EVOAB2=@ENABLE_EVOAB2@
export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
export ENABLE_FORMULA_LOGGER=@ENABLE_FORMULA_LOGGER@
diff --git a/configure.ac b/configure.ac
index a7c23de74122..e414c2d7f15f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5252,6 +5252,7 @@ if test "$enable_gui" = "no"; then
fi
USING_X11=
DISABLE_GUI=TRUE
+ test_epoxy=no
else
AC_DEFINE(HAVE_FEATURE_UI)
fi
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index d0cb6cf2cc08..295b8f2eed3f 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,cui,\
boost_headers \
$(call gb_Helper_optional,OPENCL,\
clew) \
+ epoxy \
icuuc \
icu_headers \
libxml2 \
@@ -76,11 +77,6 @@ $(eval $(call gb_Library_use_externals,cui,\
orcus \
zxing \
))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,cui,\
- epoxy \
- ))
-endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,cui,\
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 74a397cc2b02..a57717990124 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -25,12 +25,8 @@ $(eval $(call
gb_Library_set_precompiled_header,slideshow,slideshow/inc/pch/prec
$(eval $(call gb_Library_use_externals,slideshow,\
boost_headers \
box2d \
+ epoxy \
))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,slideshow,\
- epoxy \
- ))
-endif
$(eval $(call gb_Library_use_sdk_api,slideshow))
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index b23e5c5049fb..fd6dcfd6f455 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -81,15 +81,11 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
$(eval $(call gb_Library_use_externals,svxcore,\
boost_headers \
+ epoxy \
icuuc \
icu_headers \
libxml2 \
))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,svxcore,\
- epoxy \
- ))
-endif
ifeq ($(OS),MACOSX)
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 60321c5f3b90..018c44ddb2be 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -23,13 +23,9 @@ $(eval $(call
gb_Library_set_componentfile,tk,toolkit/util/tk,services))
$(eval $(call gb_Library_use_externals,tk,\
boost_headers \
-))
-
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,tk,\
epoxy \
))
-endif
+
$(eval $(call gb_Library_set_include,tk,\
$$(INCLUDE) \
-I$(SRCDIR)/toolkit/inc \
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk
b/vcl/CppunitTest_vcl_bitmap_test.mk
index 3e28b96b62e9..1c51a8d02cbe 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -22,13 +22,9 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \
$(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
boost_headers \
+ epoxy \
glm_headers \
))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
- epoxy \
- ))
-endif
$(eval $(call gb_CppunitTest_set_include,vcl_bitmap_test,\
$$(INCLUDE) \
diff --git a/vcl/CppunitTest_vcl_svm_test.mk b/vcl/CppunitTest_vcl_svm_test.mk
index 898cf28c8475..3ed8bad38492 100644
--- a/vcl/CppunitTest_vcl_svm_test.mk
+++ b/vcl/CppunitTest_vcl_svm_test.mk
@@ -15,14 +15,9 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,vcl_svm_test, \
$(eval $(call gb_CppunitTest_use_externals,vcl_svm_test,\
boost_headers \
+ epoxy \
libxml2 \
))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_CppunitTest_use_externals,vcl_svm_test,\
- epoxy \
- ))
-endif
-
$(eval $(call gb_CppunitTest_set_include,vcl_svm_test,\
$$(INCLUDE) \
diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk
index 230aa020dda0..5e0cfd2e8d3d 100644
--- a/vcl/Library_vclplug_osx.mk
+++ b/vcl/Library_vclplug_osx.mk
@@ -57,18 +57,13 @@ $(eval $(call gb_Library_use_libraries,vclplug_osx,\
$(eval $(call gb_Library_use_externals,vclplug_osx,\
boost_headers \
+ epoxy \
harfbuzz \
$(if $(filter SKIA,$(BUILD_TYPE)), \
skia \
) \
))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,vclplug_osx,\
- epoxy \
-))
-endif
-
$(eval $(call gb_Library_add_defs,vclplug_osx,\
-DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \
-DVCL_INTERNALS \
