diff options
| author | root <root@rshg054.dnsready.net> | 2013-02-10 01:12:52 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-02-10 01:12:52 -0800 |
| commit | 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (patch) | |
| tree | 016bfa1969323404c37dbef29cfc7242a5a8e9f3 /java/java-rxtx | |
| parent | e9c244cac8e5dc1c59c7e8b7bc885fef04224b70 (diff) | |
Sun Feb 10 01:12:35 PST 2013
Diffstat (limited to 'java/java-rxtx')
| -rw-r--r-- | java/java-rxtx/ChangeLog.txt | 8 | ||||
| -rw-r--r-- | java/java-rxtx/destdir.patch | 20 | ||||
| -rw-r--r-- | java/java-rxtx/java7-configure.patch | 38 |
3 files changed, 0 insertions, 66 deletions
diff --git a/java/java-rxtx/ChangeLog.txt b/java/java-rxtx/ChangeLog.txt deleted file mode 100644 index 7efab2514..000000000 --- a/java/java-rxtx/ChangeLog.txt +++ /dev/null @@ -1,8 +0,0 @@ -Differences from rxtx-2.1-7r2 made by Arduino: - * Adding support for /dev/ttyACM* devices on Linux. - * Fixing (I hope) problems on 64-bit Linux systems. - * Adding checks for Java 1.6. - * Removing unnecessary compiler warning. - -Differences from Arduino's version: - * Adding checks for Java 1.7. diff --git a/java/java-rxtx/destdir.patch b/java/java-rxtx/destdir.patch deleted file mode 100644 index 11416841f..000000000 --- a/java/java-rxtx/destdir.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2012-09-21 15:21:00.000000000 -0400 -+++ Makefile.in 2012-09-21 15:21:07.000000000 -0400 -@@ -566,13 +566,15 @@ - # install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its - # proper location - install: all -+ $(mkinstalldirs) $(DESTDIR)$(RXTX_PATH) -+ $(mkinstalldirs) $(DESTDIR)$(JHOME) - @$(LIBTOOL_INST) \ - `for i in $(TARGETLIB);do \ - if [ -f $$i ];then \ - echo $$i; \ - fi; \ -- done` $(RXTX_PATH) -- $(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/ -+ done` $(DESTDIR)$(RXTX_PATH) -+ $(INSTALL_PROGRAM) $(JARTARGET) $(DESTDIR)$(JHOME)/ - - clean-generic: - rm -rf $(DEST) $(TOP)/$(CLASSTOP) diff --git a/java/java-rxtx/java7-configure.patch b/java/java-rxtx/java7-configure.patch deleted file mode 100644 index fed710200..000000000 --- a/java/java-rxtx/java7-configure.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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*) |