diff options
Diffstat (limited to 'packages/midpath')
-rw-r--r-- | packages/midpath/midpath-cldc-native_0.1.bb | 3 | ||||
-rw-r--r-- | packages/midpath/midpath-cldc-x11_0.1.bb | 2 | ||||
-rw-r--r-- | packages/midpath/midpath-cldc_0.1.bb | 15 | ||||
-rw-r--r-- | packages/midpath/midpath.inc | 6 |
4 files changed, 10 insertions, 16 deletions
diff --git a/packages/midpath/midpath-cldc-native_0.1.bb b/packages/midpath/midpath-cldc-native_0.1.bb index 27700d2e61..30f67854d4 100644 --- a/packages/midpath/midpath-cldc-native_0.1.bb +++ b/packages/midpath/midpath-cldc-native_0.1.bb @@ -4,9 +4,6 @@ inherit native require midpath-cldc_${PV}.bb -PROVIDES = "virtual/cldc-api-1.1-native" -RPROVIDES = " " - PACKAGES = " " do_install() { diff --git a/packages/midpath/midpath-cldc-x11_0.1.bb b/packages/midpath/midpath-cldc-x11_0.1.bb index 9db0c4a686..7c92621c36 100644 --- a/packages/midpath/midpath-cldc-x11_0.1.bb +++ b/packages/midpath/midpath-cldc-x11_0.1.bb @@ -1,7 +1,7 @@ require midpath.inc -DEPENDS += " virtual/libx11 virtual/cldc-api-1.1" +DEPENDS += "virtual/libx11 midpath-cldc" do_configure() { diff --git a/packages/midpath/midpath-cldc_0.1.bb b/packages/midpath/midpath-cldc_0.1.bb index 51a1314467..7aeefa5264 100644 --- a/packages/midpath/midpath-cldc_0.1.bb +++ b/packages/midpath/midpath-cldc_0.1.bb @@ -1,9 +1,6 @@ require midpath.inc -PROVIDES = "virtual/cldc-api-1.1" -RPROVIDES = "virtual/cldc-api-1.1" - do_compile() { mkdir -p ${S}/dist @@ -18,21 +15,21 @@ cd ${S}/src/cldc-glue make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1" make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes # Make a jar -${FASTJAR_CMD} cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes . +${FASTJAR_CMD} cvf ${S}/dist/midpath-cldc1.1.jar -C ${S}/external/cldc1.1/classes . } do_install() { - install -d ${D}${datadir}/java - install -m 0644 dist/cldc1.1.jar ${D}${datadir}/java + install -d ${D}${datadir}/midpath-cldc + install -m 0644 dist/midpath-cldc1.1.jar ${D}${datadir}/midpath-cldc } do_stage() { - install -d ${STAGING_DATADIR}/java - install -m 0644 dist/cldc1.1.jar ${STAGING_DATADIR}/java + install -d ${STAGING_DATADIR}/midpath-cldc + install -m 0644 dist/midpath-cldc1.1.jar ${STAGING_DATADIR}/midpath-cldc } PACKAGES = "${PN}" -FILES_${PN} = "${datadir}/java/cldc1.1.jar" +FILES_${PN} = "${datadir}/midpath-cldc/midpath-cldc1.1.jar" diff --git a/packages/midpath/midpath.inc b/packages/midpath/midpath.inc index 9fa8facf94..4bc3b71598 100644 --- a/packages/midpath/midpath.inc +++ b/packages/midpath/midpath.inc @@ -9,7 +9,7 @@ SRC_URI = "http://downloads.sourceforge.net/midpath/midpath-${PV}.tar.gz" S = "${WORKDIR}/midpath-${PV}" -DEPENDS = "virtual/javac-native fastjar-native classpath-minimal" +DEPENDS = "virtual/javac-native fastjar-native classpath" JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/javac" @@ -17,6 +17,6 @@ FASTJAR_CMD = "${STAGING_BINDIR_NATIVE}/fastjar" JAVA_PATH = "${STAGING_DATADIR}/java" -GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath-minimal/glibj.zip" +GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath/glibj.zip" -CLDC_PATH = ${JAVA_PATH}/cldc1.1.jar +CLDC_PATH = ${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar |