aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo@ribalda.com>2019-07-05 13:18:10 +0200
committerRichard Leitner <richard.leitner@skidata.com>2019-07-09 14:39:58 +0200
commit62657ff82524ad28313c84089ee12c3654056941 (patch)
tree72410e08060ce54b53c30c28db2a0f354f7f3ad6
parenta1cd04d1bcfa2b67c905ee6a12965dec7a110adb (diff)
downloadmeta-java-62657ff82524ad28313c84089ee12c3654056941.tar.gz
meta-java-62657ff82524ad28313c84089ee12c3654056941.tar.bz2
meta-java-62657ff82524ad28313c84089ee12c3654056941.zip
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>
-rw-r--r--recipes-extended/rxtx/files/javapath.patch23
-rw-r--r--recipes-extended/rxtx/rxtx_2.2.0.bb5
2 files changed, 26 insertions, 2 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 @@
+Upstream-Status: Inappropriate
+
+Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
+
+diff --git a/configure.in b/configure.in
+index 1778a52..344f5ac 100644
+--- a/configure.in
++++ b/configure.in
+@@ -484,10 +484,10 @@ if test "$CC" = "gcc" || test "$CC"="egcs"; then
+ ;;
+ *)
+ find_java_native_include jni_md.h
+- JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
+- JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3"
+- JAR="\$(JPATH)/bin/jar"
+- JAVADOC="\$(JPATH)/bin/javadoc"
++ JAVAH="gjavah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
++ JAVAC="javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3"
++ JAR="fastjar"
++ JAVADOC="javadoc"
+ CFLAGS=$CFLAGS" -D_BSD_SOURCE"
+ ;;
+ esac
diff --git a/recipes-extended/rxtx/rxtx_2.2.0.bb b/recipes-extended/rxtx/rxtx_2.2.0.bb
index d4fbb9d..87d84a8 100644
--- a/recipes-extended/rxtx/rxtx_2.2.0.bb
+++ b/recipes-extended/rxtx/rxtx_2.2.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "Full Java CommAPI implementation"
DEPENDS = "virtual/javac-native"
LICENSE = "RXTXv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=32303a23463f90b12a7d1dafb8deabf4"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://rxtx.qbang.org/pub/rxtx/rxtx-2.2pre2.zip \
file://zsystem_init_exception.patch \
@@ -19,7 +19,8 @@ SRC_URI = "http://rxtx.qbang.org/pub/rxtx/rxtx-2.2pre2.zip \
file://usb_38400.patch \
file://fix_snprintf.patch \
file://format_security.patch \
- file://0001-Support-Freescale-i.MX-serial-ports.patch"
+ file://0001-Support-Freescale-i.MX-serial-ports.patch \
+ file://javapath.patch"
SRC_URI[md5sum] = "7eedb18e3f33a427e2b0e9be8ce3f94c"
SRC_URI[sha256sum] = "3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03"