?  search:
summary | log | graphiclog1 | graphiclog2 | refs | edit | fork

fe48108e740c7698358e62cda4ff758bd7d73734
[ub0rlay.git] / dev-java / icedtea / files / icedtea-1.4-gentoo.patch
blobfe48108e740c7698358e62cda4ff758bd7d73734
1 --- ./openjdk/j2se/make/common/Release.gmk.orig 2007-12-21 18:58:57.000000000 +0000
2 +++ ./openjdk/j2se/make/common/Release.gmk 2007-12-21 19:03:26.000000000 +0000
3 @@ -952,7 +952,7 @@
4 @# lib/ct.sym
5 @#
6 $(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym
7 - $(JAVAC_CMD) -XDprocess.packages -proc:only \
8 + $(JAVAC_CMD) -bootclasspath $(ABS_OUTPUTDIR) $(JAVAC_JVM_FLAGS) -XDprocess.packages -proc:only \
9 -processor com.sun.tools.javac.sym.CreateSymbols \
10 -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
11 -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
12 --- ./openjdk/j2se/make/common/BuildToolJar.gmk.orig 2007-12-21 18:14:24.000000000 +0000
13 +++ ./openjdk/j2se/make/common/BuildToolJar.gmk 2007-12-21 18:16:29.000000000 +0000
14 @@ -42,7 +42,7 @@
15 $(BUILDTOOL_ALL_FILES:%=$(BUILDTOOL_SOURCE_ROOT)/%)
16 @$(prep-target)
17 @$(MKDIR) -p $(BUILDTOOLCLASSDIR)
18 - $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
19 + $(BOOT_JAVAC_CMD) -cp "$(ABS_OUTPUTDIR)/classes" -d $(BUILDTOOLCLASSDIR) \
20 -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
21 $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
22 -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
23 --- ./openjdk/j2se/make/common/Rules.gmk.orig 2007-12-21 04:43:54.000000000 +0000
24 +++ ./openjdk/j2se/make/common/Rules.gmk 2007-12-21 16:15:33.000000000 +0000
25 @@ -229,14 +229,14 @@
26 # Make sure all newer sources are compiled (in a batch)
27 classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
28
29 -.compile.classlist : $(JAVA_SOURCE_LIST)
30 +.compile.classlist : $(JAVA_SOURCE_LIST)
31 @$(MKDIR) -p $(CLASSDESTDIR)
32 @if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \
33 $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
34 $(CAT) $(JAVA_SOURCE_LIST); \
35 $(ECHO) "# Running javac:"; \
36 - $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
37 - $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
38 + $(ECHO) $(JAVAC_CMD) $(JAVAC_JVM_FLAGS) -cp "$(ABS_OUTPUTDIR)/classes" -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
39 + $(JAVAC_CMD) $(JAVAC_JVM_FLAGS) -cp "$(ABS_OUTPUTDIR)/classes" -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
40 fi
41 @$(java-vm-cleanup)
42
43 --- ./openjdk/j2se/make/common/shared/Defs-java.gmk.orig 2007-12-21 14:53:56.000000000 +0000
44 +++ ./openjdk/j2se/make/common/shared/Defs-java.gmk 2007-12-22 04:52:11.000000000 +0000
45 @@ -115,6 +115,7 @@
46 JAVACFLAGS += $(CLASS_VERSION)
47 JAVACFLAGS += -encoding ascii
48 JAVACFLAGS += "-Xbootclasspath:$(CLASSBINDIR)"
49 +JAVACFLAGS += -cp "$(ABS_OUTPUTDIR)/classes"
50 JAVACFLAGS += $(OTHER_JAVACFLAGS)
51
52 # Needed for javah
53 @@ -128,20 +129,26 @@
54 DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
55 JAVAC_CMD = $(BOOT_JAVA_CMD) \
56 "-Xbootclasspath/p:$(JAVAC_JAR)" \
57 + -cp "$(ABS_OUTPUTDIR)/classes" \
58 -jar $(JAVAC_JAR) $(JAVACFLAGS)
59 JAVAH_CMD = $(BOOT_JAVA_CMD) \
60 "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
61 + -cp "$(ABS_OUTPUTDIR)/classes" \
62 -jar $(JAVAH_JAR) $(JAVAHFLAGS)
63 JAVADOC_CMD = $(BOOT_JAVA_CMD) \
64 "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
65 + -cp "$(ABS_OUTPUTDIR)/classes" \
66 -jar $(JAVADOC_JAR)
67 else
68 # If no explicit tools, use boot tools (add VM flags in this case)
69 JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
70 + -cp "$(ABS_OUTPUTDIR)/classes" \
71 $(JAVACFLAGS)
72 JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
73 + -cp "$(ABS_OUTPUTDIR)/classes" \
74 $(JAVAHFLAGS)
75 - JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
76 + JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) \
77 + -cp "$(ABS_OUTPUTDIR)/classes"
78 endif
79
80 # Override of what javac to use (see deploy workspace)
81 --- ./openjdk/j2se/make/common/Demo.gmk.orig 2007-12-21 17:48:51.000000000 +0000
82 +++ ./openjdk/j2se/make/common/Demo.gmk 2007-12-21 18:04:06.000000000 +0000
83 @@ -247,7 +247,7 @@
84 $(DEMO_RESOURCES:%=$(DEMO_JAR_IMAGE)/%)
85 @$(prep-target)
86 $(MKDIR) -p $(DEMO_JAR_IMAGE)
87 - $(JAVAC_CMD) -d $(DEMO_JAR_IMAGE) -sourcepath $(DEMO_BUILD_SRCDIR) \
88 + $(JAVAC_CMD) $(JAVAC_JVM_FLAGS) -cp $(subst j2se,control,$(ABS_OUTPUTDIR))/classes -d $(DEMO_JAR_IMAGE) -sourcepath $(DEMO_BUILD_SRCDIR) \
89 @$(DEMO_JAVAC_INPUT)
90 $(BOOT_JAR_CMD) -cfm $@ $(DEMO_MANIFEST) \
91 -C $(DEMO_JAR_IMAGE) . \
92 --- ./openjdk/j2se/make/Makefile.orig 2007-12-22 05:09:44.000000000 +0000
93 +++ ./openjdk/j2se/make/Makefile 2007-12-22 05:11:39.000000000 +0000
94 @@ -247,7 +247,7 @@
95 #
96 # Docs
97 #
98 -OTHERSUBDIRS = docs
99 +OTHERSUBDIRS =
100 docs:: sanity-docs post-sanity-docs
101 $(OTHERSUBDIRS-loop)
102
103 --- ./openjdk/hotspot/src/share/vm/adlc/adlc.hpp.orig 2007-12-20 19:52:37.000000000 +0000
104 +++ ./openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2007-12-20 19:52:48.000000000 +0000
105 @@ -35,7 +35,7 @@
106 #if _MSC_VER >= 1300 // Visual C++ 7.0 or later
107 #include <iostream>
108 #else
109 -#include <iostream.h>
110 +#include <iostream>
111 #endif
112 #include "string.h"
113 #include "ctype.h"
114 --- ./openjdk/hotspot/src/share/vm/adlc/filebuff.hpp.orig 2007-12-20 19:53:19.000000000 +0000
115 +++ ./openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2007-12-20 19:53:44.000000000 +0000
116 @@ -30,7 +30,7 @@
117 #if _MSC_VER >= 1300 // Visual C++ 7.0 or later
118 #include <iostream>
119 #else
120 -#include <iostream.h>
121 +#include <iostream>
122 #endif
123
124 // STRUCTURE FOR HANDLING INPUT AND OUTPUT FILES
125 @@ -99,8 +99,8 @@
126 FileBuffRegion *copy(); // Deep copy
127 FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
128
129 -// void print(std::ostream&);
130 -// friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
131 - void print(ostream&);
132 - friend ostream& operator<< (ostream&, FileBuffRegion&);
133 + void print(std::ostream&);
134 + friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
135 +// void print(ostream&);
136 +// friend ostream& operator<< (ostream&, FileBuffRegion&);
137 };
138 --- ./openjdk/hotspot/src/share/vm/adlc/filebuff.cpp.orig 2007-12-20 19:53:55.000000000 +0000
139 +++ ./openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2007-12-20 19:54:10.000000000 +0000
140 @@ -158,7 +158,7 @@
141 }
142
143 //------------------------------expandtab--------------------------------------
144 -static int expandtab( ostream &os, int off, char c, char fill1, char fill2 ) {
145 +static int expandtab( std::ostream &os, int off, char c, char fill1, char fill2 ) {
146 if( c == '\t' ) { // Tab?
147 do os << fill1; // Expand the tab; Output space
148 while( (++off) & 7 ); // Expand to tab stop
149 @@ -172,7 +172,7 @@
150 //------------------------------printline--------------------------------------
151 // Print and highlite a region of a line. Return the amount of highliting left
152 // to do (i.e. highlite length minus length of line).
153 -static int printline( ostream& os, const char *fname, int line,
154 +static int printline( std::ostream& os, const char *fname, int line,
155 const char *_sol, int skip, int len ) {
156
157 // Display the entire tab-expanded line
158 @@ -222,8 +222,8 @@
159 }
160
161 //------------------------------print------------------------------------------
162 -//std::ostream& operator<< ( std::ostream& os, FileBuffRegion &br ) {
163 -ostream& operator<< ( ostream& os, FileBuffRegion &br ) {
164 +//std::std::ostream& operator<< ( std::std::ostream& os, FileBuffRegion &br ) {
165 +std::ostream& operator<< ( std::ostream& os, FileBuffRegion &br ) {
166 if( &br == NULL ) return os; // The empty buffer region
167 FileBuffRegion *brp = &br; // Pointer to region
168 while( brp ) { // While have chained regions
169 @@ -238,8 +238,8 @@
170 // filename and line number to the left, and complete text lines to the right.
171 // Selected portions (portions of a line actually in the FileBuffRegion are
172 // underlined. Ellipses are used for long multi-line regions.
173 -//void FileBuffRegion::print( std::ostream& os ) {
174 -void FileBuffRegion::print( ostream& os ) {
175 +//void FileBuffRegion::print( std::std::ostream& os ) {
176 +void FileBuffRegion::print( std::ostream& os ) {
177 if( !this ) return; // Nothing to print
178 char *s = _bfr->get_line();
179 int skip = (int)(_offset - _sol); // Amount to skip to start of data
180 --- ./Makefile.in.orig 2007-12-22 17:54:03.000000000 +0000
181 +++ ./Makefile.in 2007-12-22 17:54:19.000000000 +0000
182 @@ -240,7 +240,6 @@
183 patches/icedtea-graphics.patch \
184 patches/icedtea-antialias.patch \
185 patches/icedtea-paths.patch \
186 - patches/icedtea-debuginfo.patch \
187 patches/icedtea-ssl.patch \
188 patches/icedtea-license-headers.patch \
189 patches/icedtea-libpng.patch \
genoo ub0rlay