Merge pull request #37 from kraj/master

sstate fixes

3 files changed, 9 insertions, 3 deletions

diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc
index 214c9cd..1bdfd78 100644
--- a/recipes-core/classpath/classpath.inc
+++ b/recipes-core/classpath/classpath.inc
@@ -9,7 +9,7 @@ PBN = "classpath"
 
 inherit autotools java gettext
 
-DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst"
+DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst file"
 
 RPROVIDES_${PN} = ""
 
@@ -21,7 +21,7 @@ RPROVIDES_${PN} = "${PBN}"
 RPROVIDES_${PN}-common = "${PBN}-common"
 RPROVIDES_${PN}-gtk = "${PBN}-awt"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
 
diff --git a/recipes-core/jamvm/jamvm-initial_1.4.5.bb b/recipes-core/jamvm/jamvm-initial_1.4.5.bb
index ea5a9d2..d317695 100644
--- a/recipes-core/jamvm/jamvm-initial_1.4.5.bb
+++ b/recipes-core/jamvm/jamvm-initial_1.4.5.bb
@@ -20,7 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \
 # This uses 32 bit arm, so force the instruction set to arm, not thumb
 ARM_INSTRUCTION_SET = "arm"
 
-inherit native autotools
+inherit native autotools pkgconfig
 
 # libdir must be modified so that jamvm-initial and -native
 # do not interfere
@@ -45,3 +45,6 @@ do_install_append() {
 
 SRC_URI[md5sum] = "3f538bab6e1c77aed331e5e71f754f5b"
 SRC_URI[sha256sum] = "f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5"
+# shared state for jamvm-native does not work
+# since the paths are hardcoded
+SSTATE_MIRRORS_class-native = ""
diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc
index bf2bc4b..ee0e5c0 100644
--- a/recipes-core/jamvm/jamvm.inc
+++ b/recipes-core/jamvm/jamvm.inc
@@ -47,4 +47,7 @@ FILES_${PN} += "${libdir}/jamvm/lib*.so"
 ALTERNATIVE_NAME = "java"
 ALTERNATIVE_PATH = "${bindir}/jamvm"
 ALTERNATIVE_PRIORITY = "4"
+# shared state for jamvm-native does not work
+# since the paths are hardcoded
+SSTATE_MIRRORS_class-native = ""