[meta-java,v4,09/23] rxtx: Fix path of javac

Submitted by Ricardo Ribalda Delgado on July 5, 2019, 11:18 a.m. | Patch ID: 162826

Details

Message ID 20190705111824.22255-10-ricardo@ribalda.com
State Master Next
Delegated to: Richard Leitner
Headers show

Commit Message

Ricardo Ribalda Delgado July 5, 2019, 11:18 a.m.
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>
---
 recipes-extended/rxtx/files/javapath.patch | 23 ++++++++++++++++++++++
 recipes-extended/rxtx/rxtx_2.2.0.bb        |  5 +++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 recipes-extended/rxtx/files/javapath.patch

Patch hide | download patch | download mbox

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"