/[gentoo-x86]/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch
Gentoo

Contents of /dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.2 - (show annotations) (download)
Wed Sep 26 08:42:27 2012 UTC (7 months, 3 weeks ago) by sera
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED 
Fix package.env entry of rhino. #433283
Remove vulnarable. #433389

(Portage version: 2.1.11.13/cvs/Linux x86_64)
1 diff -Nru icedtea-2.1.1.orig/acinclude.m4 icedtea-2.1.1/acinclude.m4
2 --- icedtea-2.1.1.orig/acinclude.m4 2012-06-13 02:56:54.455836680 +0100
3 +++ icedtea-2.1.1/acinclude.m4 2012-06-13 02:57:31.660476528 +0100
4 @@ -2258,3 +2258,18 @@
5 AC_SUBST(PAX_COMMAND)
6 AC_SUBST(PAX_COMMAND_ARGS)
7 ])
8 +
9 +AC_DEFUN([IT_USING_CACAO],[
10 + AC_REQUIRE([IT_FIND_JAVA])
11 + AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
12 + if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
13 + it_cv_cacao=yes;
14 + else
15 + it_cv_cacao=no;
16 + fi
17 + ])
18 + USING_CACAO=$it_cv_cacao
19 + AC_SUBST(USING_CACAO)
20 + AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
21 + AC_PROVIDE([$0])dnl
22 +])
23 diff -Nru icedtea-2.1.1.orig/configure.ac icedtea-2.1.1/configure.ac
24 --- icedtea-2.1.1.orig/configure.ac 2012-06-13 02:56:54.459836748 +0100
25 +++ icedtea-2.1.1/configure.ac 2012-06-13 02:57:31.660476528 +0100
26 @@ -101,6 +101,7 @@
27 IT_FIND_JAR
28 IT_FIND_RMIC
29 IT_FIND_NATIVE2ASCII
30 +IT_USING_CACAO
31 if test "x$enable_bootstrap" = "xyes"; then
32 IT_FIND_ECJ_JAR
33 IT_FIND_TOOL([XSLTPROC], [xsltproc])
34 diff -Nru icedtea-2.1.1.orig/Makefile.am icedtea-2.1.1/Makefile.am
35 --- icedtea-2.1.1.orig/Makefile.am 2012-06-13 02:56:54.403835785 +0100
36 +++ icedtea-2.1.1/Makefile.am 2012-06-13 02:57:31.648476322 +0100
37 @@ -249,6 +249,11 @@
38 patches/cacao/launcher.patch \
39 patches/cacao/jsig.patch \
40 patches/cacao/memory.patch
41 +else
42 +if USING_CACAO
43 +ICEDTEA_PATCHES += \
44 + patches/cacao/memory.patch
45 +endif
46 endif
47
48 if ENABLE_CACAO
49 diff -Nru icedtea-2.1.1.orig/patches/cacao/launcher.patch icedtea-2.1.1/patches/cacao/launcher.patch
50 --- icedtea-2.1.1.orig/patches/cacao/launcher.patch 2012-06-13 02:28:23.950879620 +0100
51 +++ icedtea-2.1.1/patches/cacao/launcher.patch 2012-06-13 02:59:50.858865063 +0100
52 @@ -1,14 +1,3 @@
53 ---- openjdk/jdk/make/docs/Makefile.orig 2010-08-27 20:01:53.000000000 +0200
54 -+++ openjdk/jdk/make/docs/Makefile 2010-09-07 12:56:00.309691118 +0200
55 -@@ -70,7 +70,7 @@
56 - ifeq ($(ARCH_DATA_MODEL),64)
57 - MAX_VM_MEMORY = 1024
58 - else
59 -- MAX_VM_MEMORY = 512
60 -+ MAX_VM_MEMORY = 768
61 - endif
62 -
63 - # List of all possible directories for javadoc to look for sources
64 --- openjdk/jdk/src/share/bin/java.c.orig 2010-09-07 05:24:49.307192201 +0200
65 +++ openjdk/jdk/src/share/bin/java.c 2010-09-07 12:56:00.309691118 +0200
66 @@ -174,6 +174,8 @@
67 diff -Nru icedtea-2.1.1.orig/patches/cacao/memory.patch icedtea-2.1.1/patches/cacao/memory.patch
68 --- icedtea-2.1.1.orig/patches/cacao/memory.patch 2012-06-13 02:28:23.954879676 +0100
69 +++ icedtea-2.1.1/patches/cacao/memory.patch 2012-06-13 03:01:11.156239098 +0100
70 @@ -1,6 +1,70 @@
71 ---- openjdk.orig/langtools/make/build.xml 2010-06-01 11:25:40.145287816 +0100
72 -+++ openjdk/langtools/make/build.xml 2010-06-21 21:48:41.000000000 +0100
73 -@@ -554,6 +554,7 @@
74 +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
75 +--- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2012-06-07 19:21:17.000000000 +0100
76 ++++ openjdk/hotspot/make/linux/makefiles/rules.make 2012-06-13 03:36:26.364575315 +0100
77 +@@ -141,7 +141,7 @@
78 + # Settings for javac
79 + BOOT_SOURCE_LANGUAGE_VERSION = 6
80 + BOOT_TARGET_CLASS_VERSION = 6
81 +-JAVAC_FLAGS = -g -encoding ascii
82 ++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
83 + BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
84 +
85 + # With parallel makes, print a message at the end of compilation.
86 +diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
87 +--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2012-06-07 19:21:17.000000000 +0100
88 ++++ openjdk/hotspot/make/solaris/makefiles/rules.make 2012-06-13 03:36:26.364575315 +0100
89 +@@ -133,7 +133,7 @@
90 + # Settings for javac
91 + BOOT_SOURCE_LANGUAGE_VERSION = 6
92 + BOOT_TARGET_CLASS_VERSION = 6
93 +-JAVAC_FLAGS = -g -encoding ascii
94 ++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
95 + BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
96 +
97 + # With parallel makes, print a message at the end of compilation.
98 +diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
99 +--- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2012-06-07 19:21:17.000000000 +0100
100 ++++ openjdk/hotspot/make/windows/makefiles/rules.make 2012-06-13 03:36:26.364575315 +0100
101 +@@ -45,7 +45,7 @@
102 + # Settings for javac
103 + BOOT_SOURCE_LANGUAGE_VERSION=6
104 + BOOT_TARGET_CLASS_VERSION=6
105 +-JAVAC_FLAGS=-g -encoding ascii
106 ++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
107 + BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
108 +
109 + ProjectFile=jvm.vcproj
110 +diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
111 +--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2012-06-08 14:12:38.000000000 +0100
112 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2012-06-13 03:36:26.380575614 +0100
113 +@@ -447,7 +447,7 @@
114 + else \
115 + echo "false"; \
116 + fi)
117 +- MAX_VM_MEMORY := 512
118 ++ MAX_VM_MEMORY := 1536
119 + MIN_VM_MEMORY := $(MAX_VM_MEMORY)
120 + else
121 + MB_OF_MEMORY := unknown
122 +diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
123 +--- openjdk.orig/jdk/make/docs/Makefile 2012-06-08 14:12:38.000000000 +0100
124 ++++ openjdk/jdk/make/docs/Makefile 2012-06-13 03:36:26.380575614 +0100
125 +@@ -69,9 +69,9 @@
126 + # NOTE: javadoc will not complete without these larger settings.
127 + # WARNING: This could cause thrashing on low memory machines.
128 + ifeq ($(ARCH_DATA_MODEL),64)
129 +- MAX_VM_MEMORY = 1024
130 ++ MAX_VM_MEMORY = 1792
131 + else
132 +- MAX_VM_MEMORY = 512
133 ++ MAX_VM_MEMORY = 768
134 + endif
135 +
136 + # List of all possible directories for javadoc to look for sources
137 +diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
138 +--- openjdk.orig/langtools/make/build.xml 2012-02-15 08:26:56.000000000 +0000
139 ++++ openjdk/langtools/make/build.xml 2012-06-13 03:36:26.380575614 +0100
140 +@@ -796,6 +796,7 @@
141 <compilerarg value="-implicit:none"/>
142 <compilerarg value="-Xprefer:source"/>
143 <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
  ViewVC Help
Powered by ViewVC 1.1.13