diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch')
-rw-r--r-- | recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch deleted file mode 100644 index cd6cdbf..0000000 --- a/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | |||
2 | # HG changeset patch | ||
3 | # User Andrew John Hughes <gnu_andrew@member.fsf.org> | ||
4 | # Date 1366807128 -3600 | ||
5 | # Node ID e562523c5037d8c6097afa00cc2932a959037a61 | ||
6 | # Parent d4e0f297cf8fb7a4e457d5bef8f0290623cf8b05 | ||
7 | Update CACAO to latest tip. | ||
8 | |||
9 | 2013-04-24 Andrew John Hughes <gnu.andrew@member.fsf.org> | ||
10 | |||
11 | * patches/cacao/jsig.patch: | ||
12 | Removed. | ||
13 | * Makefile.am: | ||
14 | (CACAO_VERSION): Bump to current tip. | ||
15 | (CACAO_SHA256SUM): Likewise. | ||
16 | (ICEDTEA_PATCHES): Drop unneeded jsig patch. | ||
17 | * NEWS: Updated. | ||
18 | |||
19 | diff -r d4e0f297cf8f -r e562523c5037 Makefile.am | ||
20 | --- a/Makefile.am Wed Apr 24 10:24:40 2013 +0100 | ||
21 | +++ b/Makefile.am Wed Apr 24 13:38:48 2013 +0100 | ||
22 | @@ -18,8 +18,8 @@ | ||
23 | LANGTOOLS_SHA256SUM = c412b61b095154fee4c45dc133f2baca3100fecd48b742f80da49a52ec473b02 | ||
24 | OPENJDK_SHA256SUM = 44c3e4a130fe4b76c1ba977ae2251884cefa774b82a24c4415b64395aef9594c | ||
25 | |||
26 | -CACAO_VERSION = a567bcb7f589 | ||
27 | -CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 | ||
28 | +CACAO_VERSION = e215e36be9fc | ||
29 | +CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab | ||
30 | CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao | ||
31 | CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz | ||
32 | CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz | ||
33 | @@ -266,7 +266,6 @@ | ||
34 | if BUILD_CACAO | ||
35 | ICEDTEA_PATCHES += \ | ||
36 | patches/cacao/launcher.patch \ | ||
37 | - patches/cacao/jsig.patch \ | ||
38 | patches/cacao/memory.patch | ||
39 | else | ||
40 | if USING_CACAO | ||
41 | diff -r d4e0f297cf8f -r e562523c5037 patches/cacao/jsig.patch | ||
42 | --- a/patches/cacao/jsig.patch Wed Apr 24 10:24:40 2013 +0100 | ||
43 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
44 | @@ -1,18 +0,0 @@ | ||
45 | -diff -Nru cacao.orig/Makefile.am cacao/Makefile.am | ||
46 | ---- cacao.orig/cacao/src/cacao/Makefile.am 2008-08-04 17:51:28.000000000 +0100 | ||
47 | -+++ cacao/cacao/src/cacao/Makefile.am 2010-05-11 10:29:35.000000000 +0100 | ||
48 | -@@ -96,12 +96,12 @@ | ||
49 | - $(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server | ||
50 | - $(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server | ||
51 | - $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt | ||
52 | -- $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so | ||
53 | -+ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so | ||
54 | - | ||
55 | - uninstall-local: | ||
56 | - rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so | ||
57 | - rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt | ||
58 | -- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so | ||
59 | -+ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so | ||
60 | - endif | ||
61 | - | ||
62 | - | ||
63 | |||