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 /Repository.mk | |
| 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 'Repository.mk')
| -rw-r--r-- | Repository.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index bb3c995ddaa2..7d5d0cf3546b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -147,14 +147,18 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,dbffuzzer) \ $(if $(filter-out ANDROID HAIKU iOS MACOSX WNT,$(OS)),oosplash) \ soffice_bin \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ + $(call gb_CondBuildUnopkg, \ + unopkg_bin \ + $(if $(filter WNT,$(OS)), \ + unopkg \ + unopkg_com \ + ) \ + ) \ $(if $(filter WNT,$(OS)), \ soffice_exe \ soffice_com \ soffice_safe \ unoinfo \ - unopkg \ - unopkg_com \ $(if $(filter-out AARCH64,$(CPUNAME)),twain32shim) \ ) \ )) @@ -634,7 +638,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(call gb_Helper_optional,XMLHELP,ucpchelp1) \ ucphier1 \ ucppkg1 \ - unopkgapp \ + $(call gb_CondBuildUnopkg,unopkgapp) \ xmlsecurity \ xsec_xmlsec \ xstor \ |