aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Heinold <henning@itconsulting-heinold.de>2014-03-08 01:03:19 +0100
committerHenning Heinold <henning@itconsulting-heinold.de>2014-04-07 23:57:23 +0200
commit83b6a83bf5bc5a44b56eefafbe368fffd066f8e2 (patch)
tree460b412636b06490dc926337202474645e06fc92
parent665ab3a5dac364a25538d4f2df6424a96ce061f4 (diff)
downloadmeta-java-83b6a83bf5bc5a44b56eefafbe368fffd066f8e2.tar.gz
meta-java-83b6a83bf5bc5a44b56eefafbe368fffd066f8e2.tar.bz2
meta-java-83b6a83bf5bc5a44b56eefafbe368fffd066f8e2.zip
jamvm: update git version to ebd11bde0a97b57f0d18938c6b65468d3c932719
* remove annotations.patch, because it was fixed upstream
-rw-r--r--recipes-core/jamvm/jamvm/annotations.patch31
-rw-r--r--recipes-core/jamvm/jamvm_git.bb3
2 files changed, 1 insertions, 33 deletions
diff --git a/recipes-core/jamvm/jamvm/annotations.patch b/recipes-core/jamvm/jamvm/annotations.patch
deleted file mode 100644
index 6279366..0000000
--- a/recipes-core/jamvm/jamvm/annotations.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: git/src/classlib/gnuclasspath/annotations.c
-===================================================================
---- git.orig/src/classlib/gnuclasspath/annotations.c 2013-07-29 10:44:38.597241346 +0000
-+++ git/src/classlib/gnuclasspath/annotations.c 2013-07-29 11:03:42.927744962 +0000
-@@ -247,7 +247,7 @@
- return anno;
- }
-
--Object *parseAnnotations(Class *class, AnnotationData *annotations) {
-+Object *parseAnnotations(Class *class, AttributeData *annotations) {
- if(!anno_inited && !initAnnotation())
- return NULL;
-
-@@ -290,7 +290,7 @@
- }
-
- Object *getMethodParameterAnnotations(MethodBlock *mb) {
-- AnnotationData *annotations;
-+ AttributeData *annotations;
- Object **outer_array_data;
- Object *outer_array;
- int no_params, i;
-@@ -342,7 +342,7 @@
- }
-
- Object *getMethodDefaultValue(MethodBlock *mb) {
-- AnnotationData *annotations;
-+ AttributeData *annotations;
-
- if(!anno_inited && !initAnnotation())
- return NULL;
diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb
index 97ed1cc..bfa856a 100644
--- a/recipes-core/jamvm/jamvm_git.bb
+++ b/recipes-core/jamvm/jamvm_git.bb
@@ -3,14 +3,13 @@
require jamvm.inc
-SRCREV = "ac22c9948434e528ece451642b4ebde40953ee7e"
+SRCREV = "ebd11bde0a97b57f0d18938c6b65468d3c932719"
PV = "1.5.5+1.6.0-devel+git${SRCPV}"
SRC_URI = "git://git.berlios.de/jamvm;protocol=git \
file://jamvm-jni_h-noinst.patch \
file://libffi.patch \
file://jamvm-minmax-heap.patch \
- file://annotations.patch \
file://java \
"