Package: octave / 4.4.1-5

always-build-octave-jar.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
Description: Ensure that octave.jar is built even if java is disabled
 On some archs we pass --disable-java to the configure script, but we still
 want octave-common to contain octave.jar if built on those archs.
Author: Sébastien Villemot <sebastien@debian.org>
Forwarded: not-needed
Reviewed-by: Rafael Laboissière <rafael@debian.org>
Last-Update: 2016-11-20
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/scripts/java/module.mk
+++ b/scripts/java/module.mk
@@ -1,3 +1,6 @@
+JAVAC=javac
+JAR=jar
+
 FCN_FILE_DIRS += scripts/java
 
 %canon_reldir%_FCN_FILES = \
@@ -11,22 +14,18 @@ FCN_FILE_DIRS += scripts/java
   %reldir%/javarmpath.m \
   %reldir%/usejava.m
 
-if AMCOND_HAVE_JAVA
 %canon_reldir%_JAR_FILES = %reldir%/octave.jar
 
 JAR_FILES += $(%canon_reldir%_JAR_FILES)
-endif
 
 org_octave_dir = org/octave
 
-if AMCOND_HAVE_JAVA
 JAVA_SRC = \
   $(org_octave_dir)/ClassHelper.java \
   $(org_octave_dir)/Matrix.java \
   $(org_octave_dir)/OctClassLoader.java \
   $(org_octave_dir)/Octave.java \
   $(org_octave_dir)/OctaveReference.java
-endif
 
 JAVA_CLASSES = $(JAVA_SRC:.java=.class)
 
@@ -41,13 +40,11 @@ $(%canon_reldir%_JAVA_CLASSES) : %.class
 	             -d $(abs_top_builddir)/scripts/java \
 	             $(org_octave_dir)/$(<F) )
 
-if AMCOND_HAVE_JAVA
 %reldir%/octave.jar: $(%canon_reldir%_JAVA_CLASSES)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	( cd scripts/java; \
 	  "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) ) && \
 	mv $@-t $@
-endif
 
 %canon_reldir%dir = $(fcnfiledir)/java