[Libreoffice-commits] core.git: external/apache-commons

[Robert Antoni Buj i Gelonch]

 external/apache-commons/ExternalProject_apache_commons_codec.mk |   11 +++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 04d4b703a0cad67ddbb149303e73bc722cd06884
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Mon Oct 27 19:52:51 2014 +0100

    Apache Commons Codec 1.9 at least requires Java 1.6 and non debug version
    
    Change-Id: Ie7834a908c8b19cfa46d71ff6fd712e10bbe8fbb
    Reviewed-on: https://gerrit.libreoffice.org/12115
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/apache-commons/ExternalProject_apache_commons_codec.mk b/external/apache-commons/ExternalProject_apache_commons_codec.mk
index 2135cb4..aedda04 100644
--- a/external/apache-commons/ExternalProject_apache_commons_codec.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_codec.mk
@@ -22,10 +22,15 @@ $(call gb_ExternalProject_get_state_target,apache_commons_codec,build) :
 		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			,$(if $(filter TRUE,$(HAVE_JAVA6)) \
+				,-Dcompile.source=1.6 -Dcompile.target=1.6 \
+				,-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) \
+			) \
 		) \
-		$(if $(debug),-Dbuild.debug="on") \
+		$(if $(filter TRUE,$(HAVE_JAVA6)) \
+			,$(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \
+			,$(if $(debug),-Dbuild.debug="on") \
+                ) \
 		jar \
 	)