Makefile.in | 2
RepositoryExternal.mk | 1
codemaker/Module_codemaker.mk | 3 -
comphelper/Module_comphelper.mk | 4 -
configure.ac | 65 ++++++++++++------------
i18npool/CustomTarget_localedata.mk | 24 +++++---
i18npool/Module_i18npool.mk | 4 -
icu/Module_icu.mk | 2
idl/Module_idl.mk | 6 +-
idlc/Module_idlc.mk | 14 ++++-
l10ntools/Module_l10ntools.mk | 5 +
registry/Module_registry.mk | 15 ++---
rsc/Module_rsc.mk | 4 -
solenv/Module_solenv.mk | 4 -
solenv/gbuild/Executable.mk | 2
solenv/gbuild/Module.mk | 7 ++
solenv/gbuild/TargetLocations.mk | 7 --
solenv/gbuild/extensions/post_SpeedUpTargets.mk | 10 +++
solenv/gbuild/extensions/pre_BuildTools.mk | 46 ++++++++++++++++
soltools/Module_soltools.mk | 4 -
tools/Executable_bestreversemap.mk | 4 -
tools/Module_tools.mk | 10 +--
unodevtools/Module_unodevtools.mk | 2
unoidl/Module_unoidl.mk | 4 -
24 files changed, 157 insertions(+), 92 deletions(-)
New commits:
commit bdfdd054bd25714f9c52c974f22228bee4bfbe67
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Mar 8 14:14:46 2013 +0100
more subtle dependencies for cross-compilation
Now we build only what we really need for 'build' platform - there is
new build-tools make target.
The list of tools is in solenv/gbuild/extensions/pre_BuildTools.mk.
Also similar is done to some extent for 'host' platform using
gb_Module_add_targets_for_build which is ignored for 'host'.
Change-Id: I6acd1762b16aca366aac1a0688500f27869cfca2
diff --git a/Makefile.in b/Makefile.in
index 29d6f00..0ae475a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -222,7 +222,7 @@ build-nocheck: bootstrap fetch $(if $(filter
$(INPATH),$(INPATH_FOR_BUILD)),,cro
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild build
cross-toolset: bootstrap fetch
- $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild build
+ $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild build-tools
#
# Install
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 68d4679..6a15af5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2721,6 +2721,7 @@ endef
# FIXME: the library target should be for build too
define gb_Executable__register_saxparser
$(call gb_Executable_add_runtime_dependencies,saxparser,\
+ $(call
gb_ComponentTarget_get_outdir_target,sax/source/expatwrap/expwrap) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
index c6e98b8..3bb1f0b 100644
--- a/codemaker/Module_codemaker.mk
+++ b/codemaker/Module_codemaker.mk
@@ -26,7 +26,8 @@
$(eval $(call gb_Module_Module,codemaker))
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+# if not cross-compiling or we need this for ODK
+ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,codemaker,\
Package_inc \
diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk
index 004c02b..57f1e22 100644
--- a/comphelper/Module_comphelper.mk
+++ b/comphelper/Module_comphelper.mk
@@ -20,15 +20,13 @@
$(eval $(call gb_Module_Module,comphelper))
$(eval $(call gb_Module_add_targets,comphelper,\
- Package_inc \
Library_comphelper \
+ Package_inc \
))
-ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\
JunitTest_comphelper_complex \
))
-endif
$(eval $(call gb_Module_add_check_targets,comphelper,\
CppunitTest_comphelper_test \
diff --git a/i18npool/CustomTarget_localedata.mk
b/i18npool/CustomTarget_localedata.mk
index 824cfde..8284126 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -30,23 +30,29 @@ $(eval $(call
gb_CustomTarget_CustomTarget,i18npool/localedata))
i18npool_LDDIR := $(call gb_CustomTarget_get_workdir,i18npool/localedata)
+i18npool_LD_NAMES := $(basename $(notdir $(wildcard
$(SRCDIR)/i18npool/source/localedata/data/*.xml)))
+
$(call gb_CustomTarget_get_target,i18npool/localedata) : \
- $(patsubst %.xml,$(i18npool_LDDIR)/localedata_%.cxx, \
- $(notdir $(wildcard
$(SRCDIR)/i18npool/source/localedata/data/*.xml)))
+ $(foreach
name,$(i18npool_LD_NAMES),$(i18npool_LDDIR)/localedata_$(name).cxx)
-$(i18npool_LDDIR)/localedata_%.cxx : \
- $(SRCDIR)/i18npool/source/localedata/data/%.xml \
+define i18npool_LD_RULE
+$(i18npool_LDDIR)/localedata_$(1).cxx : \
+ $(SRCDIR)/i18npool/source/localedata/data/$(1).xml \
$(i18npool_LDDIR)/saxparser.rdb \
$(call gb_Executable_get_runtime_dependencies,saxparser)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
- $(call gb_Helper_abbreviate_dirs, \
- $(call gb_Helper_execute,saxparser) $* $< $@.tmp \
+ $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1)
+ $$(call gb_Helper_abbreviate_dirs, \
+ $(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
$(call
gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb) \
-env:LO_LIB_DIR=$(call
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \
-env:URE_MORE_SERVICES=$(call
gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb)) \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
- sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@
&& \
- rm $@.tmp)
+ sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp >
$$@ && \
+ rm $$@.tmp)
+
+endef
+
+$(foreach name,$(i18npool_LD_NAMES),$(eval $(call i18npool_LD_RULE,$(name))))
$(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \
$(SOLARENV)/bin/packcomponents.xslt \
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index a8f2118..9eb5c31 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -49,15 +49,13 @@ $(eval $(call gb_Module_add_targets,i18npool,\
Package_inc \
))
-ifneq ($(CROSS_COMPILING),YES)
-$(eval $(call gb_Module_add_targets,i18npool,\
+$(eval $(call gb_Module_add_targets_for_build,i18npool,\
Executable_gencoll_rule \
Executable_genconv_dict \
Executable_gendict \
Executable_genindex_data \
Executable_saxparser \
))
-endif
$(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
diff --git a/icu/Module_icu.mk b/icu/Module_icu.mk
index 46e02d3..672308c 100644
--- a/icu/Module_icu.mk
+++ b/icu/Module_icu.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,icu))
ifeq ($(SYSTEM_ICU),NO)
-$(eval $(call gb_Module_add_targets,icu,\
+$(eval $(call gb_Module_add_targets_for_build,icu,\
UnpackedTarball_icu \
ExternalPackage_icu \
ExternalProject_icu \
diff --git a/idl/Module_idl.mk b/idl/Module_idl.mk
index 82b83b0..ea476b4 100644
--- a/idl/Module_idl.mk
+++ b/idl/Module_idl.mk
@@ -19,8 +19,8 @@
$(eval $(call gb_Module_Module,idl))
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-$(eval $(call gb_Module_add_targets,idl,Executable_svidl))
-endif
+$(eval $(call gb_Module_add_targets_for_build,idl,\
+ Executable_svidl \
+))
# vim: set noet sw=4 ts=4:
diff --git a/idlc/Module_idlc.mk b/idlc/Module_idlc.mk
index 4a79c0b..a20d105 100644
--- a/idlc/Module_idlc.mk
+++ b/idlc/Module_idlc.mk
@@ -9,9 +9,17 @@
$(eval $(call gb_Module_Module,idlc))
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-$(eval $(call gb_Module_add_targets,idlc,Executable_idlc))
-$(eval $(call gb_Module_add_check_targets,idlc,CustomTarget_parser_test))
+# if not cross-compiling or we need this for ODK
+ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE)))
+
+$(eval $(call gb_Module_add_targets,idlc,\
+ Executable_idlc \
+))
+
+$(eval $(call gb_Module_add_check_targets,idlc,\
+ CustomTarget_parser_test \
+))
+
endif
# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index fa47bf5..69d3bdd 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -26,7 +26,7 @@
$(eval $(call gb_Module_Module,l10ntools))
-$(eval $(call gb_Module_add_targets,l10ntools,\
+$(eval $(call gb_Module_add_targets_for_build,l10ntools,\
Executable_helpex \
Executable_idxdict \
Executable_ulfex \
@@ -39,6 +39,9 @@ $(eval $(call gb_Module_add_targets,l10ntools,\
Executable_treex \
Executable_stringex \
StaticLibrary_transex \
+))
+
+$(eval $(call gb_Module_add_targets,l10ntools,\
Package_ulfconv \
))
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index a488bd8..6aec72f 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -27,17 +27,18 @@
$(eval $(call gb_Module_Module,registry))
$(eval $(call gb_Module_add_targets,registry,\
- Library_reg \
- ZipPackage_registry_odk_headers \
+ Library_reg \
+ ZipPackage_registry_odk_headers \
))
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+# if not cross-compiling or we need this for ODK
+ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,registry,\
- StaticLibrary_registry_helper \
- Executable_regmerge \
- Executable_regview \
- Executable_regcompare \
+ Executable_regcompare \
+ Executable_regmerge \
+ Executable_regview \
+ StaticLibrary_registry_helper \
))
endif
diff --git a/rsc/Module_rsc.mk b/rsc/Module_rsc.mk
index 8464c93..51aa12b 100644
--- a/rsc/Module_rsc.mk
+++ b/rsc/Module_rsc.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Module_add_targets,rsc,\
Package_inc \
))
-$(if $(filter DESKTOP,$(BUILD_TYPE)),$(eval $(call gb_Module_add_targets,rsc,\
+$(eval $(call gb_Module_add_targets_for_build,rsc,\
Executable_rsc \
-)))
+))
# vim: set noet sw=4 ts=4:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index e606c10..3edb91b 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -27,11 +27,9 @@
$(eval $(call gb_Module_Module,solenv))
-ifeq ($(CROSS_COMPILING),$(false))
-$(eval $(call gb_Module_add_targets,solenv,\
+$(eval $(call gb_Module_add_targets_for_build,solenv,\
Executable_concat-deps \
))
-endif
ifneq ($(OS),WNT)
ifneq ($(OS),IOS)
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 1560e70..a74e202 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -37,7 +37,7 @@ $(dir $(call gb_Executable_get_runtime_target,%)).dir :
$(dir $(call gb_Executable_get_runtime_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_Executable_get_runtime_target,%) : $(call gb_Executable_get_target,%)
+$(call gb_Executable_get_runtime_target,%) : $(call
gb_Executable_get_target_for_build,%)
touch $@
.PHONY : $(call gb_Executable_get_clean_target,%)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 2ef383a..68c171f 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -94,6 +94,11 @@ $(call gb_Module_get_target,%) :
all : build $(if $(CROSS_COMPILING),,unitcheck $(if
$(gb_PARTIAL_BUILD),,slowcheck))
+build-tools : $(gb_BUILD_TOOLS)
+ $(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6)
+ $(call gb_Output_announce_title,build-tools done.)
+ $(call gb_Output_announce_bell)
+
build :
$(call gb_Output_announce,top level modules: $(foreach
module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir
$(module))),$(true),ALL,6)
$(call gb_Output_announce,loaded modules: $(sort
$(gb_Module_ALLMODULES)),$(true),ALL,6)
@@ -241,6 +246,8 @@ $(foreach target,$(2),$(call
gb_Module_add_target,$(1),$(target)))
endef
+gb_Module_add_targets_for_build = $(call gb_Module_add_targets,$(1),$(2))
+
define gb_Module_add_check_targets
$(foreach target,$(2),$(call gb_Module_add_check_target,$(1),$(target)))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index e5d04f5..eb31b58 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -111,7 +111,7 @@ gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
gb_Executable_get_external_headers_target =
$(WORKDIR)/ExternalHeaders/Executable/$(1)
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
-gb_Executable_get_runtime_target = $(WORKDIR)/Executable/$(1).run
+gb_Executable_get_runtime_target = $(WORKDIR_FOR_BUILD)/Executable/$(1).run
gb_ExtensionTarget_get_target = $(WORKDIR)/ExtensionTarget/$(1).oxt
gb_ExtensionTarget_get_rootdir = $(WORKDIR)/ExtensionTarget/$(1)/root
gb_ExtensionTarget_get_workdir = $(WORKDIR)/ExtensionTarget/$(1)
@@ -376,14 +376,9 @@ endef
# ExternalExecutable.
#
# gb_Executable_get_runtime_dependencies executable
-ifeq ($(CROSS_COMPILING),YES)
-define gb_Executable_get_runtime_dependencies
-endef
-else
define gb_Executable_get_runtime_dependencies
$(call gb_Executable_get_runtime_target,$(1))
endef
-endif
# Get complete command-line for running the executable
#
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 406a69e..3db7218 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -25,6 +25,16 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+ifeq ($(CROSS_COMPILING),YES)
+gb_Module_add_targets_for_build :=
+endif
+
+ifeq ($(gb_Side),build)
+gb_Module_add_check_target :=
+gb_Module_add_slowcheck_target :=
+gb_Module_add_subsequentcheck_target :=
+endif
+
ifneq ($(strip $(MAKECMDGOALS)),)
# speed up depending on the target
gb_SpeedUpTargets_LEVEL_3 := debugrun help translations
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk
b/solenv/gbuild/extensions/pre_BuildTools.mk
new file mode 100644
index 0000000..bd80ca7
--- /dev/null
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -0,0 +1,46 @@
+# -*- 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/.
+#
+
+# Tools we need to build for cross-compiling
+gb_BUILD_TOOLS = \
+ $(foreach executable, \
+ autodoc \
+ bestreversemap \
+ cfgex \
+ cpp \
+ cppumaker \
+ gencoll_rule \
+ genconv_dict \
+ gendict \
+ genindex_data \
+ helpex \
+ idlc \
+ idxdict \
+ javamaker \
+ makedepend \
+ propex \
+ regcompare \
+ regmerge \
+ regview \
+ rsc \
+ saxparser \
+ stringex \
+ svidl \
+ transex3 \
+ treex \
+ uiex \
+ ulfex \
+ xrmex \
+ ,$(call gb_Executable_get_runtime_dependencies,$(executable))) \
+ $(foreach executable, \
+ xsltproc \
+ ,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
+ Package_xmlhelp_xsl \
+
+# vim: set noet sw=4 ts=4:
diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk
index 9f30415..77396fd 100644
--- a/soltools/Module_soltools.mk
+++ b/soltools/Module_soltools.mk
@@ -9,12 +9,10 @@
$(eval $(call gb_Module_Module,soltools))
-ifneq ($(CROSS_COMPILING),YES)
-$(eval $(call gb_Module_add_targets,soltools,\
+$(eval $(call gb_Module_add_targets_for_build,soltools,\
Executable_cpp \
Executable_makedepend \
))
-endif # CROSS_COMPILING
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Module_add_targets,soltools,\
diff --git a/tools/Executable_bestreversemap.mk
b/tools/Executable_bestreversemap.mk
index 33a51dd..fbf1d13 100644
--- a/tools/Executable_bestreversemap.mk
+++ b/tools/Executable_bestreversemap.mk
@@ -22,10 +22,6 @@
$(eval $(call gb_Executable_Executable,bestreversemap))
-$(eval $(call gb_Executable_set_include,bestreversemap,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_use_libraries,bestreversemap,\
sal \
$(gb_UWINAPI) \
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index f49c489..cef5f7f 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -27,14 +27,12 @@ $(eval $(call gb_Module_add_targets,tools,\
StaticLibrary_ooopathutils \
))
-$(eval $(call gb_Module_add_check_targets,tools,\
- CppunitTest_tools_test \
+$(eval $(call gb_Module_add_targets_for_build,tools,\
+ Executable_bestreversemap \
))
-ifneq ($(CROSS_COMPILING),YES)
-$(eval $(call gb_Module_add_targets,tools,\
- Executable_bestreversemap \
+$(eval $(call gb_Module_add_check_targets,tools,\
+ CppunitTest_tools_test \
))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/unodevtools/Module_unodevtools.mk
b/unodevtools/Module_unodevtools.mk
index 16b409a..fa17d84 100644
--- a/unodevtools/Module_unodevtools.mk
+++ b/unodevtools/Module_unodevtools.mk
@@ -26,7 +26,7 @@
$(eval $(call gb_Module_Module,unodevtools))
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifneq (,$(filter ODK,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,unodevtools,\
Executable_skeletonmaker \
diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk
index eab6f12..5bc2d16 100644
--- a/unoidl/Module_unoidl.mk
+++ b/unoidl/Module_unoidl.mk
@@ -14,10 +14,8 @@ $(eval $(call gb_Module_add_targets,unoidl, \
Package_inc \
))
-ifneq ($(CROSS_COMPILING),YES)
-$(eval $(call gb_Module_add_targets,unoidl, \
+$(eval $(call gb_Module_add_targets_for_build,unoidl, \
Executable_reg2unoidl \
))
-endif
# vim: set noet sw=4 ts=4:
commit 3909015f5dd1cbd18de80f38cd1fe675b7c59b7e
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Mar 12 15:16:38 2013 +0100
fix system python check for cross-compiling
Change-Id: Icdf66eaed992e3b3e7c75c1082ac61c392c125d6
diff --git a/configure.ac b/configure.ac
index 472b41b..aef0ff3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7259,6 +7259,8 @@ AC_SUBST([MINGW_ZLIB_DLL])
# =====================================================================
# This allows a lack of system python with no error, we use internal one in
that case.
AM_PATH_PYTHON([2.6],, [:])
+# Clean PYTHON_VERSION checked below if cross-compiling
+PYTHON_VERSION=""
if test "$PYTHON" != ":"; then
PYTHON_FOR_BUILD=$PYTHON
fi
commit 44dc1e84631b3abe7f1e01618ab6a4ab6a6244a2
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Mar 12 13:10:45 2013 +0100
configure: accept JAVALIB and new JAVAINC to allow cross-compile with java
Surely this should be done better, this is only to make it work somehow.
There is too much going on with java in configure to easily make this nice.
Change-Id: I9212a2cecd16964d50d6ee0f848f5cd2935a7ca3
diff --git a/configure.ac b/configure.ac
index d7c52a4..472b41b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6351,7 +6351,7 @@ if test "$SOLAR_JAVA" != ""; then
fi
-if test "$SOLAR_JAVA" != ""; then
+if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
#
# Determine JAVALIB
# If your platform follow the common pattern
@@ -6370,21 +6370,21 @@ if test "$SOLAR_JAVA" != ""; then
aix*)
JAVA_ARCH="ppc"
JAVA_TOOLKIT="classic"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/aix"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/aix"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include"
;;
cygwin*)
x_JDKLIB=
JDKLIB="$JAVA_HOME/lib"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/win32"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+ JAVAINC="$-I$JAVA_HOME/include/win32"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include"
;;
darwin*)
x_JAVALIB=[\#]
- SOLARINC="$SOLARINC
-I$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers
-I$FRAMEWORKSHOME/JavaVM/Headers"
+ JAVAINC="-I$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers
-I$FRAMEWORKSHOME/JavaVM/Headers"
;;
dragonfly*)
@@ -6398,8 +6398,8 @@ if test "$SOLAR_JAVA" != ""; then
JAVA_TOOLKIT="server"
;;
esac
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include"
;;
freebsd*)
@@ -6418,11 +6418,11 @@ if test "$SOLAR_JAVA" != ""; then
fi
;;
esac
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/freebsd"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/bsd"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/linux"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/freebsd"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/bsd"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include"
;;
k*bsd*-gnu*)
@@ -6436,8 +6436,8 @@ if test "$SOLAR_JAVA" != ""; then
JAVA_TOOLKIT="server"
;;
esac
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include"
;;
linux-gnu*)
@@ -6530,9 +6530,9 @@ if test "$SOLAR_JAVA" != ""; then
AC_MSG_ERROR([No JAVALIB definition host_cpu $host_cpu for host_os
$host_os])
;;
esac
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/linux"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include"
;;
linux-androideabi*)
@@ -6548,7 +6548,7 @@ if test "$SOLAR_JAVA" != ""; then
mingw*)
x_JAVALIB=[\#]
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+ JAVAINC="-I$JAVA_HOME/include"
;;
*netbsd*)
@@ -6571,9 +6571,9 @@ if test "$SOLAR_JAVA" != ""; then
JAVA_TOOLKIT="client"
;;
esac
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/netbsd"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/netbsd"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include"
;;
openbsd*)
@@ -6587,9 +6587,9 @@ if test "$SOLAR_JAVA" != ""; then
JAVA_TOOLKIT="server"
;;
esac
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/openbsd"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/openbsd"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include"
;;
solaris*)
@@ -6603,9 +6603,9 @@ if test "$SOLAR_JAVA" != ""; then
JAVA_ARCH="sparc"
;;
esac
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/solaris"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/solaris"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_threads/include"
;;
esac
@@ -6616,10 +6616,11 @@ if test "$SOLAR_JAVA" != ""; then
test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB
-L$JRE_BASE_DIR/$JAVA_TOOLKIT"
test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB
-L$JRE_BASE_DIR/native_thread"
fi
-else
+elif test -z "$SOLAR_JAVA"; then
x_JAVALIB=[\#]
x_JDKLIB=[\#]
fi
+SOLARINC="$SOLARINC $JAVAINC"
AC_SUBST(JAVALIB)
AC_SUBST(JAVACOMPILER)
commit 994d9642851b830de12bffb653ab7bfe20d3ffb2
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Mar 12 12:11:45 2013 +0100
we don't need to build with java for build platform anymore
Since 17b2ace79b86bd772d9eb48b9c4ad69c0713695c
"filter: use python version of FCFGMerge"
Change-Id: Ie66be9c126d0d1a9adf28abb6b399a5219bf4dda
diff --git a/configure.ac b/configure.ac
index a081bf9..d7c52a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4029,7 +4029,6 @@ if test "$cross_compiling" = "yes"; then
sub_conf_opts=""
test -n "$enable_ccache" && sub_conf_opts="$sub_conf_opts
--enable-ccache=$enable_ccache"
test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts
--with-ant-home=$with_ant_home"
- test $with_java = no && sub_conf_opts="$sub_conf_opts --without-java"
test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts
--with-external-tar=$TARFILE_LOCATION"
test -n "${with_solver_and_workdir_root}" && sub_conf_opts="$sub_conf_opts
--with-solver-and-workdir-root=${with_solver_and_workdir_root}"
@@ -4056,6 +4055,7 @@ if test "$cross_compiling" = "yes"; then
--disable-postgresql-sdbc \
--with-parallelism="$with_parallelism" \
--without-doxygen \
+ --without-java \
ENABLE_PDFIMPORT=FALSE \
$sub_conf_opts \
--srcdir=$srcdir \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
