strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make building of cross-toolset build.pl and dmake free.

Browse source 
Adds more modules to Module_cross_*.mk.

Change-Id: I9a7a12ff07649262355bfa82bdf09fbf93b1530e
Reviewed-on: https://gerrit.libreoffice.org/2240
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Tested-by: Matúš Kukan <matus.kukan@gmail.com>
This commit is contained in:
Matúš Kukan 2013-02-10 14:26:14 +01:00
parent 7f51d6fa0d
commit a811e047be
8 changed files with 31 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Makefile.cross Normal file
View file

@ -0,0 +1,17 @@
# -*- 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 $(dir $(realpath $(firstword $(MAKEFILE_LIST))))config_build.mk
gb_Side := build
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_cross_tail_build.mk))
# vim: set noet sw=4 ts=4:

12
Makefile.in
View file

@ -46,7 +46,7 @@ else # MAKE_RESTARTS
all: build
ifeq ($(gb_Side),)
export gb_Side:=host
gb_Side:=host
endif
include $(BUILDDIR)/config_$(gb_Side).mk
@ -291,13 +291,11 @@ endif
build-nocheck : export SKIP_TESTS := YES
build-nocheck : build
# Ideally solenv would be also in Module_cross_toolset.mk
# but one would need to chase and add missing dependencies.
cross-toolset: bootstrap fetch
# We need to build icu for the build platform, as building icu for the host
# platform requires tools built as part of icu that can run on the build
# platform. see --with-cross-build in icu/ExternalProject_icu.mk
$(GNUMAKE) gb_Side=build icu
#
cd cross_tail_build && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
$(GNUMAKE) gb_Side=build solenv
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.cross
#
# Install

11
Module_cross_tail_build.mk → Module_cross_toolset.mk
View file

@ -25,9 +25,9 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
$(eval $(call gb_Module_Module,cross_tail_build))
$(eval $(call gb_Module_Module,cross_toolset))
$(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
$(eval $(call gb_Module_add_moduledirs,cross_toolset,\
autodoc \
basegfx \
binaryurp \
@ -38,7 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
cosv \
cppu \
cppuhelper \
cppunit \
external \
i18npool \
i18nutil \
idl \
@ -62,6 +62,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
sax \
setup_native \
shell \
soltools \
stoc \
store \
tools \
@ -75,12 +76,16 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
xmlreader \
$(call gb_Helper_optional,BOOST,boost) \
$(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,CPPUNIT,cppunit) \
$(call gb_Helper_optional_for_host,DESKTOP, \
helpcompiler \
xmlhelp \
) \
$(call gb_Helper_optional,EXPAT,expat) \
$(call gb_Helper_optional,ICU,icu) \
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
$(call gb_Helper_optional,LIBXML2,libxml2) \
$(call gb_Helper_optional,LIBXSLT,libxslt) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
$(call gb_Helper_optional,UCPP,ucpp) \
$(call gb_Helper_optional,ZLIB,zlib) \

2
Module_tail_build.mk
View file

@ -113,9 +113,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \
$(call gb_Helper_optional,LIBXML2,libxml2) \
libxmlsec \
$(call gb_Helper_optional,LIBXSLT,libxslt) \
$(call gb_Helper_optional,LIBXML2,libxml2) \
lingucomponent \
linguistic \
lotuswordpro \

37
cross_tail_build/Makefile
View file

@ -1,37 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_build.mk
export gb_Side=build
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_cross_tail_build.mk))
# vim: set noet sw=4 ts=4:

4
cross_tail_build/README
View file

@ -1,4 +0,0 @@
This is "tail build" for the build side of cross-compilation
See [git:tail_build/README] for details what it is good for and how to
add a module to it.

2
cross_tail_build/prj/build.lst
View file

@ -1,2 +0,0 @@
ctb cross_tail_build :: CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools NULL
ctb tail_build\prj nmake - all ctb_prj NULL

0
cross_tail_build/prj/d.lst
View file