summaryrefslogtreecommitdiff
path: root/java/java-rxtx/0000-configure-java-version.patch
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2016-11-08 15:30:52 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2016-11-08 15:30:52 -0500
commit9a07072b81d39601b5d31b6d105eae7f0c9ddb28 (patch)
treef01701a97908dd89e380a20e8655ca5c168cac32 /java/java-rxtx/0000-configure-java-version.patch
parente64759b7f75a874e476f71c5b9880fdd56a68d88 (diff)
downloadabslibre-9a07072b81d39601b5d31b6d105eae7f0c9ddb28.tar.gz
abslibre-9a07072b81d39601b5d31b6d105eae7f0c9ddb28.tar.bz2
abslibre-9a07072b81d39601b5d31b6d105eae7f0c9ddb28.zip
Removing java-rxtx: This package is in [community] repo
Diffstat (limited to 'java/java-rxtx/0000-configure-java-version.patch')
-rw-r--r--java/java-rxtx/0000-configure-java-version.patch93
1 files changed, 0 insertions, 93 deletions
diff --git a/java/java-rxtx/0000-configure-java-version.patch b/java/java-rxtx/0000-configure-java-version.patch
deleted file mode 100644
index c9e37258a..000000000
--- a/java/java-rxtx/0000-configure-java-version.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Make the JAVA_VERSION checks future-proof (for Java 6 and 7)
-
-At this point Java is mature enough that support for older versions isn't
-going to be dropped, so instead of having a growing list of new versions that
-work by default, have a short list of old versions that need special measures.
---- RXTX.orig/configure.in 2012-10-29 01:13:58.000000000 -0400
-+++ RXTX/configure.in 2012-10-29 10:56:18.000000000 -0400
-@@ -463,12 +463,6 @@
- CFLAGS=$CFLAGS" -D__need_timespec"
- case $JAVA_VERSION in
-
-- 1.2*|1.3*|1.4*|1.5*)
-- #fix_parameters $JPATH/jre/lib/javax.comm.properties
-- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
-- JHOME=$JPATH"/jre/lib/ext"
-- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-- ;;
- 1.1*)
- CLASSPATH=".:\$(TOP):\$(TOP)/src:"` \
- if [ -d $JPATH/share/kaffe/ ]; then
-@@ -498,6 +492,12 @@
- JHOME=$JPATH/"lib"
- fi
- ;;
-+ *)
-+ #fix_parameters $JPATH/jre/lib/javax.comm.properties
-+ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
-+ JHOME=$JPATH"/jre/lib/ext"
-+ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-+ ;;
- esac
-
- # Cross Compilers
-@@ -533,12 +533,6 @@
- TARGETLIB="\$(target_triplet)/librxtxSerial.la \
- \$(target_triplet)/librxtxParallel.la"
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*)
-- #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)"
-- JHOME=$JPATH/"jre/lib/ext"
-- ;;
- 1.1*)
- check_prefix
- #fix_parameters $JPATH/lib/javax.comm.properties
-@@ -570,6 +564,10 @@
- JHOME=$JPATH/"lib"
- ;;
- *)
-+ #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)"
-+ JHOME=$JPATH/"jre/lib/ext"
- ;;
- esac
- ;;
-@@ -669,15 +667,15 @@
-
- WIN32)
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*)
-- CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
-- JHOME=$JPATH"/jre/lib/ext"
-- ;;
- 1.1*)
- CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
- RXTX_PATH="\$(prefix)/lib/"
- JHOME=$JPATH/"lib"
- ;;
-+ *)
-+ CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
-+ JHOME=$JPATH"/jre/lib/ext"
-+ ;;
- esac
- if test x$WIN32INCLUDE = x; then
- echo "We need to know what directory the windows java include files"
-@@ -721,12 +719,12 @@
- 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*)
-- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-- ;;
- 1.1*)
- RXTX_PATH="\$(JPATH)/lib/"
- ;;
-+ *)
-+ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-+ ;;
- esac
- ;;
-