diff options
| author | Henning Heinold <henning@itconsulting-heinold.de> | 2014-03-08 01:03:19 +0100 |
|---|---|---|
| committer | Henning Heinold <henning@itconsulting-heinold.de> | 2014-04-16 22:10:37 +0200 |
| commit | 1b47f10517ee70e66b902d378876120fe0b20882 (patch) | |
| tree | 9a3e61d5e28e51f1fef5b9b8fd886a999c2ec812 | |
| parent | 4e6287607228c8053a48464d3bb73aad4d266c3d (diff) | |
| download | meta-java-1b47f10517ee70e66b902d378876120fe0b20882.tar.gz | |
jamvm: update git version to ebd11bde0a97b57f0d18938c6b65468d3c932719
* remove annotations.patch, because it was fixed upstream
| -rw-r--r-- | recipes-core/jamvm/jamvm/annotations.patch | 31 | ||||
| -rw-r--r-- | recipes-core/jamvm/jamvm_git.bb | 3 |
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 @@ | |||
| 1 | Index: git/src/classlib/gnuclasspath/annotations.c | ||
| 2 | =================================================================== | ||
| 3 | --- git.orig/src/classlib/gnuclasspath/annotations.c 2013-07-29 10:44:38.597241346 +0000 | ||
| 4 | +++ git/src/classlib/gnuclasspath/annotations.c 2013-07-29 11:03:42.927744962 +0000 | ||
| 5 | @@ -247,7 +247,7 @@ | ||
| 6 | return anno; | ||
| 7 | } | ||
| 8 | |||
| 9 | -Object *parseAnnotations(Class *class, AnnotationData *annotations) { | ||
| 10 | +Object *parseAnnotations(Class *class, AttributeData *annotations) { | ||
| 11 | if(!anno_inited && !initAnnotation()) | ||
| 12 | return NULL; | ||
| 13 | |||
| 14 | @@ -290,7 +290,7 @@ | ||
| 15 | } | ||
| 16 | |||
| 17 | Object *getMethodParameterAnnotations(MethodBlock *mb) { | ||
| 18 | - AnnotationData *annotations; | ||
| 19 | + AttributeData *annotations; | ||
| 20 | Object **outer_array_data; | ||
| 21 | Object *outer_array; | ||
| 22 | int no_params, i; | ||
| 23 | @@ -342,7 +342,7 @@ | ||
| 24 | } | ||
| 25 | |||
| 26 | Object *getMethodDefaultValue(MethodBlock *mb) { | ||
| 27 | - AnnotationData *annotations; | ||
| 28 | + AttributeData *annotations; | ||
| 29 | |||
| 30 | if(!anno_inited && !initAnnotation()) | ||
| 31 | 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 @@ | |||
| 3 | 3 | ||
| 4 | require jamvm.inc | 4 | require jamvm.inc |
| 5 | 5 | ||
| 6 | SRCREV = "ac22c9948434e528ece451642b4ebde40953ee7e" | 6 | SRCREV = "ebd11bde0a97b57f0d18938c6b65468d3c932719" |
| 7 | PV = "1.5.5+1.6.0-devel+git${SRCPV}" | 7 | PV = "1.5.5+1.6.0-devel+git${SRCPV}" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://git.berlios.de/jamvm;protocol=git \ | 9 | SRC_URI = "git://git.berlios.de/jamvm;protocol=git \ |
| 10 | file://jamvm-jni_h-noinst.patch \ | 10 | file://jamvm-jni_h-noinst.patch \ |
| 11 | file://libffi.patch \ | 11 | file://libffi.patch \ |
| 12 | file://jamvm-minmax-heap.patch \ | 12 | file://jamvm-minmax-heap.patch \ |
| 13 | file://annotations.patch \ | ||
| 14 | file://java \ | 13 | file://java \ |
| 15 | " | 14 | " |
| 16 | 15 | ||
