summaryrefslogtreecommitdiff
path: root/external/apache-commons
diff options
context:
space:
mode:
authorRobert Antoni Buj i Gelonch <robert.buj@gmail.com>2014-10-27 21:33:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-11-12 20:46:10 +0000
commit89db5b5b88508e55bce50240d248dd26053f4e09 (patch)
treee76547dd303ff4990472177ebb3d59b9a25d5077 /external/apache-commons
parentc245858dc42a890ab6fbfc7e2c33c60af99e61b3 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/apache-commons')
-rw-r--r--external/apache-commons/ExternalProject_apache_commons_lang.mk11
-rw-r--r--external/apache-commons/UnpackedTarball_apache_commons_lang.mk6
-rw-r--r--external/apache-commons/patches/lang.patch11
3 files changed, 25 insertions, 3 deletions
diff --git a/external/apache-commons/ExternalProject_apache_commons_lang.mk b/external/apache-commons/ExternalProject_apache_commons_lang.mk
index aadd73312bfb..c180a8970693 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 9b9f077b5fea..7d227acbde78 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 000000000000..3e5d442659b8
--- /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