diff options
| author | Kacper Kasper <kacperkasper@gmail.com> | 2018-02-25 02:55:15 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-03-05 14:17:27 +0100 |
| commit | 9c036b1d3db253a1fd43ce76ce1d919e2029af59 (patch) | |
| tree | 6e5130faa9421c0c093059b5cff08a4356407d28 /solenv | |
| parent | 73312eaff10b19d1286c225ee335451e1800df4a (diff) | |
Make LibreOffice buildable on Haiku.
* Obviously VCL wiring is missing, but most components do build.
Change-Id: Ie853ada1423a8f4c2b647be59cd47a7730c42978
Reviewed-on: https://gerrit.libreoffice.org/50293
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/concat-deps.c | 13 | ||||
| -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 |
4 files changed, 34 insertions, 2 deletions
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index b815cad29b67..d02f62c48332 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -59,6 +59,19 @@ #endif /* !(_BYTE_ORDER == _LITTLE_ENDIAN) */ #endif /* Def *BSD */ +#if defined(__HAIKU__) +#include <endian.h> +#if __BYTE_ORDER == __LITTLE_ENDIAN +#undef CORE_BIG_ENDIAN +#define CORE_LITTLE_ENDIAN +#else /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */ +#if __BYTE_ORDER == __BIG_ENDIAN +#define CORE_BIG_ENDIAN +#undef CORE_LITTLE_ENDIAN +#endif /* __BYTE_ORDER == __BIG_ENDIAN */ +#endif /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */ +#endif /* Def __HAIKU__ */ + #ifdef __sun #ifdef __sparc #define CORE_BIG_ENDIAN diff --git a/solenv/gbuild/platform/HAIKU_INTEL_GCC.mk b/solenv/gbuild/platform/HAIKU_INTEL_GCC.mk index 5582d2dc8876..27628478ad18 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/unxgcc.mk +include $(GBUILDDIR)/platform/haiku.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 6199f17b3015..bb2cbdf909d6 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/unxgcc.mk +include $(GBUILDDIR)/platform/haiku.mk # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/haiku.mk b/solenv/gbuild/platform/haiku.mk new file mode 100644 index 000000000000..7066d6946618 --- /dev/null +++ b/solenv/gbuild/platform/haiku.mk @@ -0,0 +1,19 @@ +# -*- 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: |