forked from pool/libreoffice
4e8854e6df
* 0001-Set-source-and-target-params-for-java.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=264
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 899c05b47c9fe944102f73e4ba27364e0d60c280 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
|
|
Date: Wed, 22 Apr 2015 11:24:34 +0200
|
|
Subject: [PATCH] Set source and target params for java
|
|
|
|
This fixes build on SLE11 where verification is in place to ensure
|
|
target/source are both properly set.
|
|
|
|
Interestingly these values are also set by gb_JavaClassSet_JAVACCOMMAND
|
|
but do not propagate properly somehow so they need to be repeated here.
|
|
|
|
Change-Id: I4138488909559319311cd5ce06968230c4973181
|
|
---
|
|
solenv/gbuild/JavaClassSet.mk | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
|
|
index 58a16d9..9f839cd 100644
|
|
--- a/solenv/gbuild/JavaClassSet.mk
|
|
+++ b/solenv/gbuild/JavaClassSet.mk
|
|
@@ -39,6 +39,8 @@ $(call gb_Helper_abbreviate_dirs,\
|
|
$(filter-out $(JARDEPS),$(4))) && \
|
|
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
|
|
$(gb_JavaClassSet_JAVACDEBUG) \
|
|
+ -source $(JAVA_SOURCE_VER) \
|
|
+ -target $(JAVA_TARGET_VER) \
|
|
-classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
|
|
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
|
|
@$$RESPONSEFILE &&) \
|
|
--
|
|
2.3.5
|
|
|