diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-20 13:50:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-20 13:50:12 -0400 |
| commit | c375e36ec4c4e0b3c276e2b71bdd0651fa1a6a1d (patch) | |
| tree | 4006c9e76bca24bbbdce343f8a7ac4c65b3b2ca2 /java/java-rxtx/java7-configure.patch | |
| parent | 2ecf59e36659c710c187166da65d40e0d8b6af7b (diff) | |
| parent | 422d616c151e4df847fdc5fc23af4f15946092ee (diff) | |
Merge branch 'java'
Diffstat (limited to 'java/java-rxtx/java7-configure.patch')
| -rw-r--r-- | java/java-rxtx/java7-configure.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/java/java-rxtx/java7-configure.patch b/java/java-rxtx/java7-configure.patch new file mode 100644 index 000000000..fed710200 --- /dev/null +++ b/java/java-rxtx/java7-configure.patch @@ -0,0 +1,38 @@ +--- configure.orig 2012-09-21 15:02:54.000000000 -0400 ++++ configure 2012-09-21 15:03:38.000000000 -0400 +@@ -21541,7 +21541,7 @@ + CFLAGS=$CFLAGS" -D__need_timespec" + case $JAVA_VERSION in + +- 1.2*|1.3*|1.4*|1.5*|1.6*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*) + #fix_parameters $JPATH/jre/lib/javax.comm.properties + CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` + JHOME=$JPATH"/jre/lib/ext" +@@ -21611,7 +21611,7 @@ + TARGETLIB="\$(target_triplet)/librxtxSerial.la \ + \$(target_triplet)/librxtxParallel.la" + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*|1.6*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*) + #fix_parameters $JPATH/jre/lib/javax.comm.properties + CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` + RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" +@@ -21747,7 +21747,7 @@ + + WIN32) + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*|1.6*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*) + CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH" + JHOME=$JPATH"/jre/lib/ext" + ;; +@@ -21799,7 +21799,7 @@ + CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH" + + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*|1.6*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*) + RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" + ;; + 1.1*) |