diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-07 12:45:01 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-07 19:34:40 +0100 |
| commit | 4cb6f75b390760c52f7f59fc973eaf07dfb11f44 (patch) | |
| tree | f0b60fba904fb3081b48755357bf2a9c2e2b285b /desktop | |
| parent | 33e1ffac0264f21a291d80f7fe949245752f58d8 (diff) | |
Don't build a static unopkg
Currently we don't destinguish between between extensions without
code, which couldn't be executed with DISABLE_DYNLOADING, and all
other extensions, like translations, dictionaries, etc., so there
is no need for a static unopkg.
Change-Id: I427a51b3174d074e467a582e808490a85e98e8eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128114
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Module_desktop.mk | 10 | ||||
| -rw-r--r-- | desktop/Package_scripts.mk | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index ef74bd87aab4..67ba27fbe2f0 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -33,11 +33,11 @@ $(eval $(call gb_Module_add_l10n_targets,desktop,\ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,desktop,\ Executable_soffice_bin \ - Executable_unopkg_bin \ + $(call gb_CondBuildUnopkg,Executable_unopkg_bin) \ $(if $(ENABLE_BREAKPAD),Executable_minidump_upload) \ Library_migrationoo2 \ Library_migrationoo3 \ - Library_unopkgapp \ + $(call gb_CondBuildUnopkg,Library_unopkgapp) \ Package_scripts \ $(if $(ENABLE_PAGEIN), \ Pagein_calc \ @@ -79,8 +79,10 @@ $(eval $(call gb_Module_add_targets,desktop,\ Executable_sweb \ Executable_swriter \ Executable_unoinfo \ - Executable_unopkg \ - Executable_unopkg_com \ + $(call gb_CondBuildUnopkg, \ + Executable_unopkg \ + Executable_unopkg_com \ + ) \ WinResTarget_quickstart \ WinResTarget_sbase \ WinResTarget_scalc \ diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk index fbd74f43539b..0c9b1c3ec648 100644 --- a/desktop/Package_scripts.mk +++ b/desktop/Package_scripts.mk @@ -12,7 +12,9 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip ifeq (,$(filter MACOSX WNT,$(OS))) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace)) +ifneq (,$(call gb_CondBuildUnopkg,$(true))) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh)) +endif endif |