canvas/Module_canvas.mk | 4 ++--
configure.ac | 27 +++++++++++++--------------
desktop/Module_desktop.mk | 12 ++----------
sal/Library_sal.mk | 26 +++++++++++++-------------
shell/Module_shell.mk | 2 +-
solenv/gbuild/CliUnoApi.mk | 2 +-
solenv/gbuild/LinkTarget.mk | 7 +++----
solenv/gbuild/platform/macosx.mk | 2 +-
solenv/gbuild/platform/unxgcc.mk | 24 +++++++++++++-----------
vcl/Module_vcl.mk | 18 ++++++++++++------
10 files changed, 61 insertions(+), 63 deletions(-)
New commits:
commit 17608c5718dbebfaf301b3a00d735161f66b1a69
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Dec 13 11:54:32 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Mon Dec 13 16:48:47 2021 +0100
Refactor some buildsytem stuff (mostly whitespace)
Change-Id: Idfca786ecc7251e08525bd5b45936143727c43d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126731
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 0ca3c4c9bfe0..aadd9f369c83 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -24,8 +24,8 @@ $(eval $(call gb_Module_add_targets,canvas,\
Library_canvastools \
Library_simplecanvas \
Library_vclcanvas \
- $(if $(filter DESKTOP,$(BUILD_TYPE)), \
- $(if $(DISABLE_GUI),,Executable_canvasdemo)) \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)), \
+ $(if $(DISABLE_GUI),,Executable_canvasdemo)) \
))
ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
diff --git a/configure.ac b/configure.ac
index 52b3b5f14d1e..760f03ebf9de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2987,14 +2987,6 @@ if test -z "$enable_extensions"; then
fi
fi
-if test "$enable_extensions" = yes; then
- BUILD_TYPE="$BUILD_TYPE EXTENSIONS"
- AC_DEFINE(HAVE_FEATURE_EXTENSIONS)
-else
- enable_extension_integration=no
- enable_extension_update=no
-fi
-
DISABLE_SCRIPTING=''
if test "$enable_scripting" = yes; then
BUILD_TYPE="$BUILD_TYPE SCRIPTING"
@@ -3020,6 +3012,14 @@ else
fi
AC_SUBST(DISABLE_DYNLOADING)
+if test "$enable_extensions" = yes; then
+ BUILD_TYPE="$BUILD_TYPE EXTENSIONS"
+ AC_DEFINE(HAVE_FEATURE_EXTENSIONS)
+else
+ enable_extension_integration=no
+ enable_extension_update=no
+fi
+
# remember SYSBASE value
AC_SUBST(SYSBASE)
@@ -11582,7 +11582,6 @@ if test "x$enable_qt6" = "xyes"; then
fi
AC_SUBST(ENABLE_QT6)
-
ENABLE_KF5=""
if test "x$enable_kf5" = "xyes"; then
ENABLE_KF5="TRUE"
@@ -12414,15 +12413,13 @@ AC_SUBST([HAVE_LO_CLANG_DLLEXPORTINLINES])
SYSTEM_GPGMEPP=
+AC_MSG_CHECKING([whether to enable gpgmepp])
if test "$enable_gpgmepp" = no; then
- AC_MSG_CHECKING([whether to enable gpgmepp])
AC_MSG_RESULT([no])
elif test "$enable_mpl_subset" = "yes"; then
- AC_MSG_CHECKING([whether gpgmepp should be disabled due to building just
MPL])
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([no (MPL only])
elif test "$enable_fuzzers" = "yes"; then
- AC_MSG_CHECKING([whether gpgmepp should be disabled due to oss-fuzz])
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([no (oss-fuzz)])
elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then
dnl ===================================================================
dnl Check for system gpgme
@@ -12498,6 +12495,8 @@ elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o
"$_os" = "WINNT" ; then
AC_MSG_RESULT([no])
fi
fi
+else
+ AC_MSG_RESULT([no (unsuppoted OS)])
fi
AC_SUBST(ENABLE_GPGMEPP)
AC_SUBST(SYSTEM_GPGMEPP)
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 1c8bdb5691b3..a03a552e4271 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
CustomTarget_soffice \
))
-ifeq ($(USING_X11), TRUE)
+ifeq ($(USING_X11),TRUE)
$(eval $(call gb_Module_add_targets,desktop,\
Package_sbase_sh \
Package_scalc_sh \
@@ -98,15 +98,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
WinResTarget_swriter \
))
-else ifeq ($(OS),MACOSX)
-
-else ifeq ($(OS),ANDROID)
-
-else ifeq ($(OS),iOS)
-
-else ifeq ($(OS),HAIKU)
-
-else
+else ifeq (,$(filter MACOSX ANDROID iOS HAIKU,$(OS)))
$(eval $(call gb_Module_add_targets,desktop,\
Executable_oosplash \
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 8dd881c4e982..a323aedaa7b1 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -131,19 +131,19 @@ $(eval $(call gb_Library_add_cxxflags,sal,\
endif
sal_textenc_code= \
- sal/textenc/context \
- sal/textenc/convertbig5hkscs \
- sal/textenc/converteuctw \
- sal/textenc/convertgb18030 \
- sal/textenc/convertisciidevangari \
- sal/textenc/convertiso2022cn \
- sal/textenc/convertiso2022jp \
- sal/textenc/convertiso2022kr \
- sal/textenc/convertsinglebytetobmpunicode \
- sal/textenc/tables \
- sal/textenc/tcvtbyte \
- sal/textenc/tcvtmb \
- sal/textenc/tcvtutf7 \
+ sal/textenc/context \
+ sal/textenc/convertbig5hkscs \
+ sal/textenc/converteuctw \
+ sal/textenc/convertgb18030 \
+ sal/textenc/convertisciidevangari \
+ sal/textenc/convertiso2022cn \
+ sal/textenc/convertiso2022jp \
+ sal/textenc/convertiso2022kr \
+ sal/textenc/convertsinglebytetobmpunicode \
+ sal/textenc/tables \
+ sal/textenc/tcvtbyte \
+ sal/textenc/tcvtmb \
+ sal/textenc/tcvtutf7 \
ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_add_exception_objects,sal,\
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index e6d66355c27e..b14868eb48d3 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,shell))
-ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP)
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,shell,\
Executable_lngconvex \
))
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 0b8e42750502..db8401d0c306 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -24,7 +24,7 @@ $(call gb_Helper_abbreviate_dirs,\
--assembly-description "This assembly contains metadata for the
LibreOffice API." \
--assembly-version $(CLI_UNOAPI_VERSION) \
--keyfile $(CLI_UNOAPI_KEYFILE) \
- $(if $(verbose),--verbose) \
+ $(if $(gb_VERBOSE),--verbose) \
$(foreach api,$(CLI_UNOAPI_DEPS),-X $(api)) \
$(foreach assembly,$(CLI_UNOAPI_ASSEMBLIES),-r $(assembly)) \
$(CLI_UNOAPI_API) \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 278664571d8e..fa71771b6582 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -45,10 +45,9 @@ gb_LinkTarget__symbols_enabled = \
# debug flags, if the LinkTarget is named in the list of libraries of
ENABLE_SYMBOLS_FOR
gb_LinkTarget__get_debugflags= \
-$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS), \
-$(if $(ENABLE_OPTIMIZED_DEBUG),$(gb_COMPILERDEBUGOPTFLAGS), \
-$(gb_COMPILERNOOPTFLAGS))) \
-$(if $(call gb_LinkTarget__symbols_enabled,$(1)),$(gb_DEBUGINFO_FLAGS))
+ $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS), \
+ $(if
$(ENABLE_OPTIMIZED_DEBUG),$(gb_COMPILERDEBUGOPTFLAGS),$(gb_COMPILERNOOPTFLAGS)))
\
+ $(if $(call gb_LinkTarget__symbols_enabled,$(1)),$(gb_DEBUGINFO_FLAGS))
# similar for LDFLAGS, use linker optimization flags in non-debug case,
# but moreover strip debug from libraries for which debuginfo is not wanted
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 1d139009931e..8aa26ae9eac0 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -348,7 +348,7 @@ gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION)
# UnoApiHeadersTarget class
-ifneq ($(filter TRUE,$(DISABLE_DYNLOADING)),)
+ifeq ($(DISABLE_DYNLOADING),TRUE)
gb_UnoApiHeadersTarget_select_variant = $(if $(filter
udkapi,$(1)),comprehensive,$(2))
else
gb_UnoApiHeadersTarget_select_variant = $(2)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index c6b207983dc4..fe935a5e8a1a 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -103,6 +103,8 @@ gb_LinkTarget__cmd_lockfile = $(if
$(LOCKFILE),$(LOCKFILE),$(call gb_Executable_
gb_LinkTarget__Lock := $(WORKDIR)/LinkTarget/link.lock
gb_LinkTarget__WantLock = $(if $(and $(filter-out ANDROID MACOSX iOS
WNT,$(OS)),$(filter TRUE,$(DISABLE_DYNLOADING)),$(filter CppunitTest
Executable,$(TARGETTYPE))),$(true))
+gb_LinkTarget__NeedsCxxLinker = $(if
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out
XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(true))
+
# note that `cat $(extraobjectlist)` is needed to build with older gcc
versions, e.g. 4.1.2 on SLED10
# we want to use @$(extraobjectlist) in the long run
# link with C compiler if there are no C++ files (pyuno_wrapper depends on
this)
@@ -113,7 +115,7 @@ gb_LinkTarget__WantLock = $(if $(and $(filter-out ANDROID
MACOSX iOS WNT,$(OS)),
define gb_LinkTarget__command_dynamiclink
$(if $(gb_LinkTarget__WantLock),$(gb_LinkTarget__cmd_lockfile) -r -1
$(gb_LinkTarget__Lock))
$(call gb_Helper_abbreviate_dirs,\
- $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out
XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(or $(T_CXX),$(gb_CXX))
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
+ $(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX))
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(T_LTOFLAGS) \
$(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \
@@ -132,13 +134,13 @@ $(call gb_Helper_abbreviate_dirs,\
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst
%.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
$(T_LIBS) \
- $(if
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out
XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(T_STDLIBS_CXX)) \
+ $(if $(call
gb_LinkTarget__NeedsCxxLinker),$(T_STDLIBS_CXX)) \
-Wl$(COMMA)--end-group \
- , \
+ , \
-Wl$(COMMA)--start-group \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
$(T_LIBS) \
- $(if
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out
XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(T_STDLIBS_CXX)) \
+ $(if $(call
gb_LinkTarget__NeedsCxxLinker),$(T_STDLIBS_CXX)) \
-Wl$(COMMA)--end-group \
-Wl$(COMMA)--no-as-needed \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst
%.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))))) \
@@ -146,13 +148,13 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(1) \
$(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1))
$(ILIBTARGET)) \
$(if $(gb_LinkTarget__WantLock),; RC=$$? ; rm -f
$(gb_LinkTarget__Lock); if test $$RC -ne 0; then exit $$RC; fi))
- $(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\
- $(READELF) -d $(1) | grep SONAME >
$(WORKDIR)/LinkTarget/$(2).exports.tmp; \
- $(NM) $(gb_LTOPLUGINFLAGS) --dynamic --extern-only
--defined-only --format=posix $(1) \
- | cut -d' ' -f1-2 \
- >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \
- $(call
gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,
\
- $(WORKDIR)/LinkTarget/$(2).exports,$(1))))
+
+$(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\
+ $(READELF) -d $(1) | grep SONAME > $(WORKDIR)/LinkTarget/$(2).exports.tmp;
\
+ $(NM) $(gb_LTOPLUGINFLAGS) --dynamic --extern-only --defined-only
--format=posix $(1) \
+ | cut -d' ' -f1-2 >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \
+ $(call
gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,
\
+ $(WORKDIR)/LinkTarget/$(2).exports,$(1))))
endef
define gb_LinkTarget__command_staticlink
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index f8a34880b338..96d87dd3b3de 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -31,15 +31,16 @@ $(eval $(call gb_Module_add_targets,vcl,\
Package_skia_denylist ) \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
- $(if $(ENABLE_MACOSX_SANDBOX),, \
- $(if $(DISABLE_GUI),, \
- Executable_ui-previewer)) \
- $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
- $(if $(DISABLE_GUI),, \
+ $(if $(DISABLE_GUI),, \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ Executable_ui-previewer) \
+ $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
Executable_vcldemo \
Executable_icontest \
Executable_visualbackendtest \
- Executable_mtfdemo ))) \
+ Executable_mtfdemo \
+ ) \
+ )) \
))
ifeq ($(CROSS_COMPILING)$(DISABLE_DYNLOADING),)
@@ -72,29 +73,34 @@ $(eval $(call gb_Module_add_targets,vcl,\
Library_vclplug_gtk3 \
))
endif
+
ifneq ($(ENABLE_GTK4),)
$(eval $(call gb_Module_add_targets,vcl,\
Library_vclplug_gtk4 \
))
endif
+
ifneq ($(ENABLE_KF5),)
$(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_kf5_moc \
Library_vclplug_kf5 \
))
endif
+
ifneq ($(ENABLE_QT5),)
$(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_qt5_moc \
Library_vclplug_qt5 \
))
endif
+
ifneq ($(ENABLE_QT6),)
$(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_qt6_moc \
Library_vclplug_qt6 \
))
endif
+
ifneq ($(ENABLE_GTK3_KDE5),)
$(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_gtk3_kde5_moc \
