[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk solenv/gbuild

[David Tardon]

 RepositoryExternal.mk        |   10 ++++++++++
 solenv/gbuild/AutoInstall.mk |    3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 638b808646976ae4c39da84ee88fbcfd22730b67
Author: David Tardon <dtardon at redhat.com>
Date:   Mon May 19 10:28:12 2014 +0200

    AutoInstall defs must be regenerated if config changes
    
    Change-Id: I506faca987ec4d1a85362dc9aec61aa4c3d21789

diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index c25c935..5701b7f 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -20,7 +20,8 @@ $(dir $(call gb_AutoInstall_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \
-		$(SRCDIR)/Repository.mk $(SRCDIR)/RepositoryExternal.mk
+		$(SRCDIR)/Repository.mk $(SRCDIR)/RepositoryExternal.mk \
+		$(BUILDDIR)/config_host.mk
 	$(call gb_Output_announce,$*,$(true),AIN,3)
 	echo "/* autogenerated installs for group $* */" > $@
 	$(call gb_AutoInstall__make_define,\
commit 2dec067928da439dad282de6e084c1ed983836a5
Author: David Tardon <dtardon at redhat.com>
Date:   Mon May 19 10:20:37 2014 +0200

    fdo#78857 jars aren't built without java
    
    Change-Id: Ide604ea90fb1b26e5e2a72f5eb273fd1686d27c5

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6e2d19b..e1a3a9e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3165,9 +3165,11 @@ endef
 
 else # !SYSTEM_HSQLDB
 
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
 	hsqldb \
 ))
+endif
 
 define gb_Jar__use_hsqldb
 $(call gb_Jar_use_jar,$(1),hsqldb)
@@ -3187,9 +3189,11 @@ endef
 
 else # !SYSTEM_BSH
 
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \
 	bsh \
 ))
+endif
 
 define gb_Jar__use_bsh
 $(call gb_Jar_use_jar,$(1),bsh)
@@ -3206,9 +3210,11 @@ endef
 
 else # !SYSTEM_RHINO
 
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
 	js \
 ))
+endif
 
 define gb_Jar__use_rhino
 $(call gb_Jar_use_jar,$(1),js)
@@ -3240,9 +3246,11 @@ gb_ExternalProject__use_commons-logging :=
 
 else # !SYSTEM_APACHE_COMMONS
 
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
 	commons-logging-1.1.3 \
 ))
+endif
 $(eval $(call gb_Helper_register_jars,OXT,\
 	commons-codec-1.9 \
 	commons-httpclient-3.1 \
@@ -3332,6 +3340,7 @@ endef
 
 else # !SYSTEM_JFREEREPORT
 
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
 	flow-engine \
 	flute-1.1.6 \
@@ -3345,6 +3354,7 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
 	libxml-1.1.7 \
 	sac \
 ))
+endif
 
 define gb_Jar__use_flow-engine
 $(call gb_Jar_use_jar,$(1),flow-engine)