diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2007-08-14 21:57:08 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2007-08-14 21:57:08 +0000 |
| commit | 1616516477734abefa3e6793aaa80f3b2f8fffe5 (patch) | |
| tree | 6f70b8e0d95a4f25fec9a3a5ce52591574d9bd0e | |
| parent | 0e2c1dfd93f645edc7aeb5a9ed842fedbe5f4436 (diff) | |
| parent | 2e41c04b23eb15218e23dbf14a635b99b5a0b8f1 (diff) | |
merge of '466c8b9e91ad4ef8b12d3e05578482072dcaec1b'
and '4d2a973ba5459115ffe04bca3dfe369dc364c77e'
| -rw-r--r-- | packages/cacao/cacaoh-cldc-native_0.98.bb | 2 | ||||
| -rw-r--r-- | packages/midpath/midpath-native_svn.bb | 2 | ||||
| -rw-r--r-- | packages/midpath/midpath_svn.bb | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/packages/cacao/cacaoh-cldc-native_0.98.bb b/packages/cacao/cacaoh-cldc-native_0.98.bb index e24225a042..ebadf3e023 100644 --- a/packages/cacao/cacaoh-cldc-native_0.98.bb +++ b/packages/cacao/cacaoh-cldc-native_0.98.bb @@ -1,7 +1,7 @@ require cacao.inc -DEPENDS = "ecj-native classpath-minimal-native virtual/cldc-api-1.1 libtool-native zlib-native" +DEPENDS = "ecj-native classpath-minimal-native virtual/cldc-api-1.1-native libtool-native zlib-native" inherit native diff --git a/packages/midpath/midpath-native_svn.bb b/packages/midpath/midpath-native_svn.bb index 199facdeb1..dfc9ca6c4e 100644 --- a/packages/midpath/midpath-native_svn.bb +++ b/packages/midpath/midpath-native_svn.bb @@ -4,7 +4,7 @@ inherit native require midpath_${PV}.bb DEPENDS = "ecj-native fastjar-native classpath-minimal-native" -PROVIDES = "virtual/cldc-api-1.1" +PROVIDES = "virtual/cldc-api-1.1-native" PACKAGES = " " diff --git a/packages/midpath/midpath_svn.bb b/packages/midpath/midpath_svn.bb index 6393ddcb7a..1813c26a0b 100644 --- a/packages/midpath/midpath_svn.bb +++ b/packages/midpath/midpath_svn.bb @@ -9,6 +9,7 @@ SRC_URI = "svn://midpath.svn.sourceforge.net/svnroot/midpath;module=trunk;proto= S = "${WORKDIR}/trunk" DEPENDS = "ecj-native fastjar-native classpath-minimal" +PROVIDES = "virtual/cldc-api-1.1" RPROVIDES_midpath-cldc = "virtual/cldc-api-1.1" JAVAC_CMD=${STAGING_BINDIR_NATIVE}/ecj @@ -70,7 +71,7 @@ cd ${S}/src/core make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH}:${S}/dist/sdljava-cldc.jar:${S}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${S}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -sourcepath ${S}/src/core -source 1.3 -target 1.1" || exit 1 make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath $CLDC_PATH:${GNU_CLASSPATH_PATH}:${S}/dist/sdljava-cldc.jar:${S}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${S}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -source 1.3 -target 1.1" CLASS_DIR=${S}/src/core/classes || exit 1 # Compile JVM.java separately as it can't be compiled against cldc.jar -${JAVA_CMD} -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java +${JAVAC_CMD} -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java ${FASTJAR_CMD} cvf ${S}/dist/midpath.jar -C ${S}/src/core/classes . cd ${S}/tests |