From b14c265fce3fd34ce603e43a62a4756d8f2732ee Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@gmx.net>
Date: Fri, 10 Oct 2008 14:06:33 +0000
Subject: rxtx 2.1-7r2: Fix libtool incompatibility.

---
 packages/rxtx/rxtx_2.1-7r2.bb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'packages')

diff --git a/packages/rxtx/rxtx_2.1-7r2.bb b/packages/rxtx/rxtx_2.1-7r2.bb
index 9b4f9fa4fa..360d5acd78 100644
--- a/packages/rxtx/rxtx_2.1-7r2.bb
+++ b/packages/rxtx/rxtx_2.1-7r2.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 SECTION = "libs"
 HOMEPAGE = "http://rxtx.org"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "classpath classpath-tools-native"
 
@@ -14,13 +14,18 @@ SRC_URI = "\
     file://rxtx-fixes-from-debian.patch;patch=1 \
     "
 
+do_removebinaries_append() {
+	rm acinclude.m4
+}
+
 do_compile() {
   # Whatever configure detected it is completely unusable. So we override heavily.
   oe_runmake \
     JAVAH="gjavah -classpath \$(CLASSPATH) -d \$(DEST) -jni" \
     JAR=gjar \
     JAVAC="javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" \
-    JAVAINCLUDEDIR=${STAGING_INCDIR}/classpath
+    JAVAINCLUDEDIR=${STAGING_INCDIR}/classpath \
+		GLIBTOOL="${TARGET_SYS}-libtool"
 }
 
 do_install() {
@@ -28,8 +33,9 @@ do_install() {
   install -d ${D}/${datadir_java}
 
   oe_runmake install \
-    RXTX_PATH=${D}/${libdir_jni} \
-    JHOME=${D}/${datadir_java}
+    RXTX_PATH="${D}/${libdir_jni}" \
+    JHOME="${D}/${datadir_java}" \
+		GLIBTOOL="${TARGET_SYS}-libtool"
 }
 
 do_stage() {
-- 
cgit v1.2.3