diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-07-27 10:32:12 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-27 10:32:12 +0000 |
| commit | ccf82499ebfe39b56600044ec78273fd13ba23b0 (patch) | |
| tree | 82eb3854c2d16f38651ab3b09b161e4be3ac1764 /packages/classpath | |
| parent | 3b770f96f6991d6d43a83f035e6cf98a2d040d92 (diff) | |
| parent | 18afb09aa6c08b22f6455dd5f9e2a6a16fe38312 (diff) | |
merge of '2700039073a3760641797b52ac5897f2eee3d92a'
and 'ddb3262e0fe9acfe7d20567e33ef27bcfe0d0801'
Diffstat (limited to 'packages/classpath')
| -rw-r--r-- | packages/classpath/classpath-initial_0.93.bb | 3 | ||||
| -rw-r--r-- | packages/classpath/classpath-native.inc | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packages/classpath/classpath-initial_0.93.bb b/packages/classpath/classpath-initial_0.93.bb index 9e303f6eba..7c1b91eb20 100644 --- a/packages/classpath/classpath-initial_0.93.bb +++ b/packages/classpath/classpath-initial_0.93.bb @@ -5,7 +5,7 @@ require classpath-native.inc DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native." -PR = "r0" +PR = "r2" DEPENDS = "zip-native fastjar-native jikes-native" @@ -25,4 +25,3 @@ EXTRA_OECONF = "\ --with-native-libdir=${STAGING_LIBDIR}/classpath-initial \ --includedir=${STAGING_INCDIR}/classpath-initial \ " - diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc index bb5abaf178..94eac9633e 100644 --- a/packages/classpath/classpath-native.inc +++ b/packages/classpath/classpath-native.inc @@ -10,9 +10,13 @@ DEPENDS = "ecj-initial fastjar-native zip-native" inherit autotools native +export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" + +# Note: the --with-ecj options seems redundant but is +# for compatibility with older classpath versions. EXTRA_OECONF = "\ - --with-glibj \ --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \ + --with-glibj \ --with-fastjar=fastjar \ --enable-local-sockets \ --disable-alsa \ |