diff options
| author | Kacper Kasper <kacperkasper@gmail.com> | 2018-08-06 00:22:39 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-08-29 11:17:33 +0200 |
| commit | 5f60f6fe1475491ac0c2f529fb2d074c32336add (patch) | |
| tree | 762fef1a5358182bb8e7c8b41586222ee5d025fe /Repository.mk | |
| parent | 84151f7aa93521070fe405c60cbd0eaab4305805 (diff) | |
Various Haiku improvements
* Fix make distro-pack-install.
* Remove Xorg dependency.
* Remove stack protector workaround.
* Update distro-config and enabled features.
Change-Id: I273dc8343ad84bd77b86453cc01ff427b50ea0b5
Reviewed-on: https://gerrit.libreoffice.org/58634
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index fdcb6115c507..56174af8ef07 100644 --- a/Repository.mk +++ b/Repository.mk @@ -142,7 +142,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,mtpfuzzer) \ $(call gb_Helper_optional,FUZZERS,htmlfuzzer) \ $(call gb_Helper_optional,FUZZERS,sftfuzzer) \ - $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ + $(if $(filter-out ANDROID HAIKU IOS MACOSX WNT,$(OS)),oosplash) \ soffice_bin \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ $(if $(filter WNT,$(OS)), \ @@ -236,7 +236,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \ endif $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ - $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ + $(if $(and $(ENABLE_JAVA),$(filter-out HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ $(if $(ENABLE_MACOSX_SANDBOX),, \ regmerge \ regview \ @@ -1016,7 +1016,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\ desktop_branding \ $(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ - $(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\ + $(if $(and $(filter-out MACOSX HAIKU WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\ $(if $(DISABLE_GUI),, \ desktop_soffice_sh \ ) \ |