From a2d91ed512d248d832e385c40db6f31d0886dabe Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@gmx.net>
Date: Sun, 27 Jul 2008 15:34:08 +0000
Subject: disapproval of revision 'ff3cafe77c935d7b92703d6844722054ef7f9774'

---
 packages/classpath/classpath-native.inc | 4 ----
 packages/classpath/classpath.inc        | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc
index 310ca3c3af..bb5abaf178 100644
--- a/packages/classpath/classpath-native.inc
+++ b/packages/classpath/classpath-native.inc
@@ -10,10 +10,6 @@ DEPENDS = "ecj-initial fastjar-native zip-native"
 
 inherit autotools native
 
-# Newer versions expect setting the compiler through this
-# environment variable.
-export JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial
-
 EXTRA_OECONF = "\
   --with-glibj \
   --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index 0ea5d36f33..cfb9f1c089 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -20,13 +20,9 @@ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
 
 S = "${WORKDIR}/${PBN}-${PV}"
 
-# Newer versions expect setting the compiler through this
-# environment variable.
-export JAVAC=${STAGING_BINDIR_NATIVE}/javac
-
 EXTRA_OECONF = "\
   --with-glibj \
-  --with-ecj=${STAGING_BINDIR_NATIVE}/javac \
+  --with-ecj=javac \
   --with-fastjar=fastjar \
   --includedir=${includedir}/classpath \
   --with-vm=java \
-- 
cgit v1.2.3