Kaydet (Commit) 04d4b703 authored tarafından Robert Antoni Buj i Gelonch's avatar Robert Antoni Buj i Gelonch Kaydeden (comit) Caolán McNamara

Apache Commons Codec 1.9 at least requires Java 1.6 and non debug version

Change-Id: Ie7834a908c8b19cfa46d71ff6fd712e10bbe8fbb
Reviewed-on: https://gerrit.libreoffice.org/12115Tested-by: 's avatarLibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst ebabf6d1
......@@ -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 \
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment