Kaydet (Commit) 60f1490a authored tarafından Kacper Kasper's avatar Kacper Kasper Kaydeden (comit) Michael Meeks

Buildsystem changes to recognize Haiku.

Change-Id: I219d556f8e124cfe426cc1ac3c54da34eb7ef790
Reviewed-on: https://gerrit.libreoffice.org/49925Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 48fd0d45
......@@ -59,7 +59,7 @@ else # MAKE_RESTARTS
all: build
check-if-root:
@if test `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then \
@if test ! `uname` = 'Haiku' && `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then \
echo; \
echo 'No. You make ME a sandwich.'; \
echo; \
......
......@@ -53,6 +53,28 @@ elif [ $(uname) = Darwin ]; then
exec ${LO_TRACE} "${exedir}/$@"
elif [ $(uname) = Haiku ]; then
dir=$(readlink -f "$(pwd)")
while test ! -d "${dir}/instdir/program" ; do
if test "${dir}" = "/"; then
echo "error: cannot find \"program\" dir from \"$(pwd)\""
exit 1
fi
dir=$(readlink -f "${dir}/..")
done
exedir="${dir}"/workdir/LinkTarget/Executable
export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc
export LIBRARY_PATH=${LIBRARY_PATH:+$LIBRARY_PATH:}"${dir}"/instdir/program
# echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
# echo "setting search path to: ${LIBRARY_PATH}"
# echo "execing: ${exedir}/$1"
exec ${LO_TRACE} "${exedir}/$@"
else
dir=$(readlink -f "$(pwd)")
......
......@@ -81,7 +81,7 @@ endif
else ifeq ($(CPUNAME),INTEL)
ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD HAIKU,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_intel
bridge_asm_objects := call
bridge_exception_objects := cpp2uno except uno2cpp
......@@ -176,7 +176,7 @@ bridge_exception_objects := except
else ifeq ($(CPUNAME),X86_64)
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD HAIKU,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
bridge_asm_objects := call
bridge_noncallexception_noopt_objects := callvirtualmethod
......@@ -223,7 +223,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
))
ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX IOS,$(OS)),)
ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX IOS HAIKU,$(OS)),)
$(eval $(call gb_Library_add_libs,gcc3_uno,\
-ldl \
))
......
......@@ -786,6 +786,29 @@ linux-android*)
BUILD_TYPE="$BUILD_TYPE CAIRO FONTCONFIG FREETYPE"
;;
haiku*)
test_cups=no
test_dbus=no
test_randr=no
test_xrender=no
test_freetype=yes
test_cairo=yes
enable_java=no
enable_opengl=no
enable_odk=no
enable_gconf=no
enable_gnome_vfs=no
enable_gstreamer=no
enable_vlc=no
enable_gltf=no
enable_collada=no
enable_coinmp=no
enable_pdfimport=no
enable_postgresql_sdbc=no
enable_firebird_sdbc=no
_os=Haiku
;;
*)
AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice for!])
;;
......@@ -4020,6 +4043,31 @@ freebsd*)
esac
;;
haiku*)
COM=GCC
USING_X11=
GUIBASE=haiku
RTL_OS=Haiku
OS=HAIKU
P_SEP=:
case "$host_cpu" in
i*86)
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=haiku_x86
;;
x86_64|amd64)
CPUNAME=X86_64
RTL_ARCH=X86_64
PLATFORMID=haiku_x86_64
;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
;;
kfreebsd*)
COM=GCC
USING_X11=TRUE
......
--with-vendor=The Document Foundation
--with-system-libxml
--with-system-neon
--with-system-boost
--with-boost-libdir=/boot/system/lib
--with-system-clucene
--with-system-expat
--with-system-libpng
--with-system-jpeg
--with-system-zlib
--with-system-bzip2
--with-system-icu
--with-system-openssl
--with-system-curl
--with-system-cppunit
--with-system-hunspell
--with-system-altlinuxhyph
--with-system-lcms2
--with-system-librevenge
--with-system-libodfgen
--with-system-libwpd
--with-system-libwpg
--with-system-libwps
--with-system-libvisio
--with-system-libcdr
--with-system-libmspub
--with-system-libmwaw
--with-system-libetonyek
--with-system-libfreehand
--with-system-libebook
--with-system-libabw
--with-system-libpagemaker
--with-system-libzmf
--with-system-libstaroffice
--with-system-libqxp
--with-system-epoxy
--with-system-clucene
--with-system-mdds
--with-system-glm
--with-system-openldap
--with-system-liblangtag
--with-system-graphite
--with-system-harfbuzz
--with-system-nss
--with-system-lpsolve
--with-system-orcus
--with-system-redland
--with-system-libcmis
--with-system-cairo
--with-theme=breeze sifr
--with-galleries=no
--without-helppack-integration
--without-java
--without-system-jars
--without-doxygen
--disable-sdremote
--disable-gio
--disable-randr
--disable-gstreamer-0-10
--disable-cups
--disable-ccache
--disable-postgresql-sdbc
--disable-lotuswordpro
--disable-firebird-sdbc
--disable-cairo-canvas
--enable-python=no
# -*- 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/.
#
#please make generic modifications to unxgcc.mk
gb_CPUDEFS := -DX86
include $(GBUILDDIR)/platform/unxgcc.mk
# vim: set noet sw=4:
# -*- 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/.
#
#please make generic modifications to unxgcc.mk
include $(GBUILDDIR)/platform/unxgcc.mk
# vim: set noet sw=4:
......@@ -252,6 +252,8 @@ else ifeq ($(OS_FOR_BUILD),WNT)
# In theory possible if cross-compiling to some Unix from Windows,
# in practice strongly discouraged to even try that
gb_Helper_LIBRARY_PATH_VAR := PATH
else ifeq ($(OS_FOR_BUILD),HAIKU)
gb_Helper_LIBRARY_PATH_VAR := LIBRARY_PATH
else
gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment