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

[Robert Antoni Buj i Gelonch]

 external/apache-commons/ExternalProject_apache_commons_lang.mk |   11 +++++++---
 external/apache-commons/UnpackedTarball_apache_commons_lang.mk |    6 +++++
 external/apache-commons/patches/lang.patch                     |   11 ++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 89db5b5b88508e55bce50240d248dd26053f4e09
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Mon Oct 27 21:33:11 2014 +0100

    Apache Commons Lang 3.3.1 at least requires Java 1.6 and non debug version
    
    Change-Id: If6526a9170f90227fff6b148f24a0dc99ff42941
    Reviewed-on: https://gerrit.libreoffice.org/12116
    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_lang.mk b/external/apache-commons/ExternalProject_apache_commons_lang.mk
index aadd733..c180a89 100644
--- a/external/apache-commons/ExternalProject_apache_commons_lang.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_lang.mk
@@ -22,10 +22,15 @@ $(call gb_ExternalProject_get_state_target,apache_commons_lang,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") \
+			,$(if $(debug),-Dbuild.debug="on") \
+                ) \
 		jar \
 	)
 
diff --git a/external/apache-commons/UnpackedTarball_apache_commons_lang.mk b/external/apache-commons/UnpackedTarball_apache_commons_lang.mk
index 9b9f077..7d227ac 100644
--- a/external/apache-commons/UnpackedTarball_apache_commons_lang.mk
+++ b/external/apache-commons/UnpackedTarball_apache_commons_lang.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_lang))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_lang,$(APACHE_COMMONS_LANG_TARBALL),,apache-commons))
 
+$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_lang,\
+        $(if $(filter TRUE,$(HAVE_JAVA6)) \
+		,external/apache-commons/patches/lang.patch \
+	) \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/patches/lang.patch b/external/apache-commons/patches/lang.patch
new file mode 100644
index 0000000..3e5d442
--- /dev/null
+++ b/external/apache-commons/patches/lang.patch
@@ -0,0 +1,11 @@
+--- misc/commons-lang3-src/default.properties	2014-03-15 13:47:48.000000000 +0100
++++ misc/build/commons-lang3-src/default.properties	2014-10-30 17:57:53.000000000 +0100
+@@ -60,7 +60,7 @@
+ test.home = src/test/java
+ 
+ # Should Java compilations set the 'debug' compiler option?
+-compile.debug = true
++compile.debug = false
+ 
+ # Should Java compilations set the 'deprecation' compiler option?
+ compile.deprecation = true