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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/HAIKU_INTEL_GCC.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/HAIKU_X86_64_GCC.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/haiku.mk | 19 |
3 files changed, 2 insertions, 21 deletions
diff --git a/solenv/gbuild/platform/HAIKU_INTEL_GCC.mk b/solenv/gbuild/platform/HAIKU_INTEL_GCC.mk index 27628478ad18..5582d2dc8876 100644 --- a/solenv/gbuild/platform/HAIKU_INTEL_GCC.mk +++ b/solenv/gbuild/platform/HAIKU_INTEL_GCC.mk @@ -11,6 +11,6 @@ gb_CPUDEFS := -DX86 -include $(GBUILDDIR)/platform/haiku.mk +include $(GBUILDDIR)/platform/unxgcc.mk # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/HAIKU_X86_64_GCC.mk b/solenv/gbuild/platform/HAIKU_X86_64_GCC.mk index bb2cbdf909d6..6199f17b3015 100644 --- a/solenv/gbuild/platform/HAIKU_X86_64_GCC.mk +++ b/solenv/gbuild/platform/HAIKU_X86_64_GCC.mk @@ -9,6 +9,6 @@ #please make generic modifications to unxgcc.mk -include $(GBUILDDIR)/platform/haiku.mk +include $(GBUILDDIR)/platform/unxgcc.mk # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/haiku.mk b/solenv/gbuild/platform/haiku.mk deleted file mode 100644 index 7066d6946618..000000000000 --- a/solenv/gbuild/platform/haiku.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - - -include $(GBUILDDIR)/platform/unxgcc.mk - -ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE) -gb_CFLAGS_COMMON += -lssp -gb_CXXFLAGS_COMMON += -lssp -gb_LinkTarget_LDFLAGS += -lssp -endif - -# vim: set noet sw=4 ts=4: |