Disable oosplash pagein feature for static builds

I'm not sure how useful this is today. Still hard-disabled on Mac
and Win. Obviously unneeded for static builds.

Change-Id: I3a95dede3c596ccdc0d15eba9edc072ad35f33fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128089
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jenkins
This commit is contained in:
Jan-Marek Glogowski
2022-01-06 08:19:41 +01:00
parent b5d9fefe0e
commit 97e2dc2ed0
6 changed files with 37 additions and 17 deletions

View File

@ -185,6 +185,7 @@ export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
export ENABLE_OPENSSL=@ENABLE_OPENSSL@
export ENABLE_OPTIMIZED=@ENABLE_OPTIMIZED@
export ENABLE_OPTIMIZED_DEBUG=@ENABLE_OPTIMIZED_DEBUG@
export ENABLE_PAGEIN=@ENABLE_PAGEIN@
export ENABLE_PCH=@ENABLE_PCH@
export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
export ENABLE_PDFIUM=@ENABLE_PDFIUM@

View File

@ -153,7 +153,12 @@
*
* Can be turned off with --without-xmlhelp
*/
#define HAVE_FEATURE_XMLHELP 0
/*
* Whether oosplash calls pagein binaries to speed up library loading.
* Probably not useful nowadays with SSD based systems.
*/
#define HAVE_FEATURE_PAGEIN 0
#endif

View File

@ -912,6 +912,7 @@ cygwin*|wsl*)
using_x11=no
test_openldap=no
test_eot=no
enable_pagein=no
build_skia=yes
_os=WINNT
@ -930,6 +931,7 @@ darwin*|macos*) # macOS
using_freetype_fontconfig=no
using_x11=no
build_skia=yes
enable_pagein=no
test_eot=no
if test -n "$LODE_HOME" ; then
mac_sanitize_path
@ -1977,7 +1979,6 @@ AC_ARG_ENABLE(customtarget-components,
AS_HELP_STRING([--enable-customtarget-components],
[This is WIP and probably just works together with --enable-wasm-strip.]))
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
@ -5849,6 +5850,16 @@ if test "$test_kf5" = "yes" -a "$enable_kf5" = "yes"; then
fi
fi
AC_MSG_CHECKING([whether to build the pagein binaries for oosplash])
if test "${enable_pagein}" != no -a -z "$DISABLE_DYNLOADING"; then
AC_MSG_RESULT([yes])
ENABLE_PAGEIN=TRUE
AC_DEFINE(HAVE_FEATURE_PAGEIN)
else
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_PAGEIN)
dnl ===================================================================
dnl check for cups support
dnl ===================================================================

View File

@ -18,7 +18,7 @@ $(eval $(call gb_Executable_use_libraries,oosplash,\
$(eval $(call gb_Executable_add_cobjects,oosplash,\
desktop/unx/source/args \
desktop/unx/source/file_image_unx \
desktop/unx/source/pagein \
$(if $(ENABLE_PAGEIN),desktop/unx/source/pagein) \
desktop/unx/source/splashx \
desktop/unx/source/start \
))

View File

@ -39,17 +39,14 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_migrationoo3 \
Library_unopkgapp \
Package_scripts \
))
ifneq ($(OS),MACOSX)
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,desktop,\
Pagein_calc \
Pagein_common \
Pagein_draw \
Pagein_impress \
Pagein_writer \
CustomTarget_soffice \
$(if $(ENABLE_PAGEIN), \
Pagein_calc \
Pagein_common \
Pagein_draw \
Pagein_impress \
Pagein_writer \
) \
$(if $(filter-out MACOSX WNT,$(OS)),CustomTarget_soffice) \
))
ifeq ($(USING_X11),TRUE)
@ -64,8 +61,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
))
endif
endif
endif
endif
ifeq ($(OS),WNT)

View File

@ -19,8 +19,16 @@
#pragma once
#include <sal/config.h>
#include <config_features.h>
#if HAVE_FEATURE_PAGEIN
void pagein_execute(char const* path, char const* file);
#else
inline void pagein_execute(char const* path, char const* file)
{
(void)path;
(void)file;
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */