diff options
author | Ricardo Ribalda Delgado <ricardo@ribalda.com> | 2019-07-05 13:18:10 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2019-07-09 14:39:58 +0200 |
commit | 62657ff82524ad28313c84089ee12c3654056941 (patch) | |
tree | 72410e08060ce54b53c30c28db2a0f354f7f3ad6 /recipes-extended/rxtx/files/javapath.patch | |
parent | a1cd04d1bcfa2b67c905ee6a12965dec7a110adb (diff) | |
download | meta-java-62657ff82524ad28313c84089ee12c3654056941.tar.gz |
rxtx: Fix path of javac
rxtx was wrongly using the patch from cacao sysroot.
Fixes:
| /bin/bash: /workdir/build/tmp/work/x86_64-linux/cacao-native/1.6.1-r0/recipe-sysroot-native/usr/bin/javac: No such file or directory
| Makefile:834: recipe for target '/workdir/build/tmp/work/dbfp4-poky-linux/rxtx/2.2.0-r2/rxtx-2.2pre2/gnu/io/UnsupportedCommOperationException.class' failed
| make: *** [/workdir/build/tmp/work/dbfp4-poky-linux/rxtx/2.2.0-r2/rxtx-2.2pre2/gnu/io/UnsupportedCommOperationException.class] Error 127
| make: *** Waiting for unfinished jobs....
Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-extended/rxtx/files/javapath.patch')
-rw-r--r-- | recipes-extended/rxtx/files/javapath.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-extended/rxtx/files/javapath.patch b/recipes-extended/rxtx/files/javapath.patch new file mode 100644 index 0000000..e0c1737 --- /dev/null +++ b/recipes-extended/rxtx/files/javapath.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> | ||
4 | |||
5 | diff --git a/configure.in b/configure.in | ||
6 | index 1778a52..344f5ac 100644 | ||
7 | --- a/configure.in | ||
8 | +++ b/configure.in | ||
9 | @@ -484,10 +484,10 @@ if test "$CC" = "gcc" || test "$CC"="egcs"; then | ||
10 | ;; | ||
11 | *) | ||
12 | find_java_native_include jni_md.h | ||
13 | - JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni" | ||
14 | - JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" | ||
15 | - JAR="\$(JPATH)/bin/jar" | ||
16 | - JAVADOC="\$(JPATH)/bin/javadoc" | ||
17 | + JAVAH="gjavah -classpath \$(CLASSPATH) -d \$(DEST) -jni" | ||
18 | + JAVAC="javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" | ||
19 | + JAR="fastjar" | ||
20 | + JAVADOC="javadoc" | ||
21 | CFLAGS=$CFLAGS" -D_BSD_SOURCE" | ||
22 | ;; | ||
23 | esac | ||