changeset in /hg/icedtea6: Move patches to hierarchical name space.
Andrew John Hughes
gnu_andrew at member.fsf.org
Wed Dec 3 06:31:32 PST 2008
changeset a59dccb92ae7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a59dccb92ae7
description:
Move patches to hierarchical name space.
2008-12-03 Andrew John Hughes <gnu_andrew at member.fsf.org>
Create hierarchical patch space.
* patches/icedtea-4486841.patch,
* patches/icedtea-6484091.patch,
* patches/icedtea-6497740.patch,
* patches/icedtea-6588160.patch,
* patches/icedtea-6592792.patch,
* patches/icedtea-6721753.patch,
* patches/icedtea-6726779.patch,
* patches/icedtea-6733959.patch,
* patches/icedtea-6734167.patch,
* patches/icedtea-6755943.patch,
* patches/icedtea-6766136.patch,
* patches/icedtea-ecj-hotspot-14.0b08.patch,
* patches/icedtea-ecj-hotspot-original.patch,
* patches/icedtea-ecj-jopt.patch,
* patches/icedtea-ecj-pr261.patch,
* patches/icedtea-ecj-spp.patch,
* patches/icedtea-ecj.patch,
* patches/icedtea-hotspot-14.0b08-bytecodeInterpreter.patch,
* patches/icedtea-hotspot-14.0b08-core-build.patch,
* patches/icedtea-hotspot-14.0b08-debuginfo.patch,
* patches/icedtea-hotspot-14.0b08-gcc-4.3.patch,
* patches/icedtea-hotspot-14.0b08-gcc-suffix.patch,
* patches/icedtea-hotspot-14.0b08-headers.patch,
* patches/icedtea-hotspot-14.0b08-memory-limits.patch,
* patches/icedtea-hotspot-14.0b08-params-cast-size_t.patch,
* patches/icedtea-hotspot-14.0b08-shark-build.patch,
* patches/icedtea-hotspot-14.0b08-sparc-ptracefix.patch,
* patches/icedtea-hotspot-14.0b08-sparc-trapsfix.patch,
* patches/icedtea-hotspot-14.0b08-sparc64-linux.patch,
* patches/icedtea-hotspot-14.0b08-static-libstdc++.patch,
* patches/icedtea-hotspot-14.0b08-text-relocations.patch,
* patches/icedtea-hotspot-14.0b08-use-idx_t.patch,
* patches/icedtea-hotspot-14.0b08-version.patch,
* patches/icedtea-hotspot-14.0b08-zero-build.patch,
* patches/icedtea-hotspot-original-bytecodeInterpreter.patch,
* patches/icedtea-hotspot-original-core-build.patch,
* patches/icedtea-hotspot-original-debuginfo.patch,
* patches/icedtea-hotspot-original-gcc-4.3.patch,
* patches/icedtea-hotspot-original-gcc-suffix.patch,
* patches/icedtea-hotspot-original-headers.patch,
* patches/icedtea-hotspot-original-memory-limits.patch,
* patches/icedtea-hotspot-original-params-cast-size_t.patch,
* patches/icedtea-hotspot-original-shark-build.patch,
* patches/icedtea-hotspot-original-sparc-ptracefix.patch,
* patches/icedtea-hotspot-original-sparc-trapsfix.patch,
* patches/icedtea-hotspot-original-sparc64-linux.patch,
* patches/icedtea-hotspot-original-static-libstdc++.patch,
* patches/icedtea-hotspot-original-text-relocations.patch,
* patches/icedtea-hotspot-original-use-idx_t.patch,
* patches/icedtea-hotspot-original-version.patch,
* patches/icedtea-hotspot-original-zero-build.patch,
* patches/icedtea-xrender-000.patch,
* patches/icedtea-xrender-001.patch,
* patches/icedtea-xrender-002.patch,
* patches/icedtea-xrender-003.patch,
* patches/icedtea-xrender-004.patch,
* patches/icedtea-xrender-005.patch,
* patches/icedtea-xrender-006.patch,
* patches/icedtea-xrender-007.patch,
* patches/icedtea-xrender-008.patch,
* patches/icedtea-xrender-009.patch:
Move patches...
* Makefile.am: Fixed paths.
* patches/ecj/icedtea-hotspot-14.0b08.patch,
* patches/ecj/icedtea-hotspot-original.patch,
* patches/ecj/icedtea-jopt.patch,
* patches/ecj/icedtea-pr261.patch,
* patches/ecj/icedtea-spp.patch,
* patches/ecj/icedtea.patch,
* patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch,
* patches/hotspot/14.0b08/icedtea-core-build.patch,
* patches/hotspot/14.0b08/icedtea-debuginfo.patch,
* patches/hotspot/14.0b08/icedtea-gcc-4.3.patch,
* patches/hotspot/14.0b08/icedtea-gcc-suffix.patch,
* patches/hotspot/14.0b08/icedtea-headers.patch,
* patches/hotspot/14.0b08/icedtea-memory-limits.patch,
* patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch,
* patches/hotspot/14.0b08/icedtea-shark-build.patch,
* patches/hotspot/14.0b08/icedtea-sparc-ptracefix.patch,
* patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch,
* patches/hotspot/14.0b08/icedtea-sparc64-linux.patch,
* patches/hotspot/14.0b08/icedtea-static-libstdc++.patch,
* patches/hotspot/14.0b08/icedtea-text-relocations.patch,
* patches/hotspot/14.0b08/icedtea-use-idx_t.patch,
* patches/hotspot/14.0b08/icedtea-version.patch,
* patches/hotspot/14.0b08/icedtea-zero-build.patch,
* patches/hotspot/original/icedtea-bytecodeInterpreter.patch,
* patches/hotspot/original/icedtea-core-build.patch,
* patches/hotspot/original/icedtea-debuginfo.patch,
* patches/hotspot/original/icedtea-gcc-4.3.patch,
* patches/hotspot/original/icedtea-gcc-suffix.patch,
* patches/hotspot/original/icedtea-headers.patch,
* patches/hotspot/original/icedtea-memory-limits.patch,
* patches/hotspot/original/icedtea-params-cast-size_t.patch,
* patches/hotspot/original/icedtea-shark-build.patch,
* patches/hotspot/original/icedtea-sparc-ptracefix.patch,
* patches/hotspot/original/icedtea-sparc-trapsfix.patch,
* patches/hotspot/original/icedtea-sparc64-linux.patch,
* patches/hotspot/original/icedtea-static-libstdc++.patch,
* patches/hotspot/original/icedtea-text-relocations.patch,
* patches/hotspot/original/icedtea-use-idx_t.patch,
* patches/hotspot/original/icedtea-version.patch,
* patches/hotspot/original/icedtea-zero-build.patch,
* patches/security/icedtea-4486841.patch,
* patches/security/icedtea-6484091.patch,
* patches/security/icedtea-6497740.patch,
* patches/security/icedtea-6588160.patch,
* patches/security/icedtea-6592792.patch,
* patches/security/icedtea-6721753.patch,
* patches/security/icedtea-6726779.patch,
* patches/security/icedtea-6733959.patch,
* patches/security/icedtea-6734167.patch,
* patches/security/icedtea-6755943.patch,
* patches/security/icedtea-6766136.patch,
* patches/xrender/icedtea-000.patch,
* patches/xrender/icedtea-001.patch,
* patches/xrender/icedtea-002.patch,
* patches/xrender/icedtea-003.patch,
* patches/xrender/icedtea-004.patch,
* patches/xrender/icedtea-005.patch,
* patches/xrender/icedtea-006.patch,
* patches/xrender/icedtea-007.patch,
* patches/xrender/icedtea-008.patch,
* patches/xrender/icedtea-009.patch:
...to here.
diffstat:
124 files changed, 21263 insertions(+), 21134 deletions(-)
ChangeLog | 129
Makefile.am | 68
patches/ecj/icedtea-hotspot-14.0b08.patch | 48
patches/ecj/icedtea-hotspot-original.patch | 45
patches/ecj/icedtea-jopt.patch | 26
patches/ecj/icedtea-pr261.patch | 40
patches/ecj/icedtea-spp.patch | 65
patches/ecj/icedtea.patch | 1023 ++
patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch | 11
patches/hotspot/14.0b08/icedtea-core-build.patch | 108
patches/hotspot/14.0b08/icedtea-debuginfo.patch | 15
patches/hotspot/14.0b08/icedtea-gcc-4.3.patch | 54
patches/hotspot/14.0b08/icedtea-gcc-suffix.patch | 25
patches/hotspot/14.0b08/icedtea-headers.patch | 13
patches/hotspot/14.0b08/icedtea-memory-limits.patch | 23
patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch | 121
patches/hotspot/14.0b08/icedtea-shark-build.patch | 233
patches/hotspot/14.0b08/icedtea-sparc-ptracefix.patch | 34
patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch | 21
patches/hotspot/14.0b08/icedtea-sparc64-linux.patch | 42
patches/hotspot/14.0b08/icedtea-static-libstdc++.patch | 16
patches/hotspot/14.0b08/icedtea-text-relocations.patch | 15
patches/hotspot/14.0b08/icedtea-use-idx_t.patch | 45
patches/hotspot/14.0b08/icedtea-version.patch | 38
patches/hotspot/14.0b08/icedtea-zero-build.patch | 129
patches/hotspot/original/icedtea-bytecodeInterpreter.patch | 36
patches/hotspot/original/icedtea-core-build.patch | 113
patches/hotspot/original/icedtea-debuginfo.patch | 15
patches/hotspot/original/icedtea-gcc-4.3.patch | 72
patches/hotspot/original/icedtea-gcc-suffix.patch | 25
patches/hotspot/original/icedtea-headers.patch | 12
patches/hotspot/original/icedtea-memory-limits.patch | 21
patches/hotspot/original/icedtea-params-cast-size_t.patch | 121
patches/hotspot/original/icedtea-shark-build.patch | 232
patches/hotspot/original/icedtea-sparc-ptracefix.patch | 34
patches/hotspot/original/icedtea-sparc-trapsfix.patch | 21
patches/hotspot/original/icedtea-sparc64-linux.patch | 93
patches/hotspot/original/icedtea-static-libstdc++.patch | 33
patches/hotspot/original/icedtea-text-relocations.patch | 25
patches/hotspot/original/icedtea-use-idx_t.patch | 282
patches/hotspot/original/icedtea-version.patch | 36
patches/hotspot/original/icedtea-zero-build.patch | 133
patches/icedtea-4486841.patch | 1234 --
patches/icedtea-6484091.patch | 129
patches/icedtea-6497740.patch | 1587 ---
patches/icedtea-6588160.patch | 42
patches/icedtea-6592792.patch | 360
patches/icedtea-6721753.patch | 116
patches/icedtea-6726779.patch | 142
patches/icedtea-6733959.patch | 231
patches/icedtea-6734167.patch | 89
patches/icedtea-6755943.patch | 617 -
patches/icedtea-6766136.patch | 189
patches/icedtea-ecj-hotspot-14.0b08.patch | 48
patches/icedtea-ecj-hotspot-original.patch | 45
patches/icedtea-ecj-jopt.patch | 26
patches/icedtea-ecj-pr261.patch | 40
patches/icedtea-ecj-spp.patch | 65
patches/icedtea-ecj.patch | 1023 --
patches/icedtea-hotspot-14.0b08-bytecodeInterpreter.patch | 11
patches/icedtea-hotspot-14.0b08-core-build.patch | 108
patches/icedtea-hotspot-14.0b08-debuginfo.patch | 15
patches/icedtea-hotspot-14.0b08-gcc-4.3.patch | 54
patches/icedtea-hotspot-14.0b08-gcc-suffix.patch | 25
patches/icedtea-hotspot-14.0b08-headers.patch | 13
patches/icedtea-hotspot-14.0b08-memory-limits.patch | 23
patches/icedtea-hotspot-14.0b08-params-cast-size_t.patch | 121
patches/icedtea-hotspot-14.0b08-shark-build.patch | 233
patches/icedtea-hotspot-14.0b08-sparc-ptracefix.patch | 34
patches/icedtea-hotspot-14.0b08-sparc-trapsfix.patch | 21
patches/icedtea-hotspot-14.0b08-sparc64-linux.patch | 42
patches/icedtea-hotspot-14.0b08-static-libstdc++.patch | 16
patches/icedtea-hotspot-14.0b08-text-relocations.patch | 15
patches/icedtea-hotspot-14.0b08-use-idx_t.patch | 45
patches/icedtea-hotspot-14.0b08-version.patch | 38
patches/icedtea-hotspot-14.0b08-zero-build.patch | 129
patches/icedtea-hotspot-original-bytecodeInterpreter.patch | 36
patches/icedtea-hotspot-original-core-build.patch | 113
patches/icedtea-hotspot-original-debuginfo.patch | 15
patches/icedtea-hotspot-original-gcc-4.3.patch | 72
patches/icedtea-hotspot-original-gcc-suffix.patch | 25
patches/icedtea-hotspot-original-headers.patch | 12
patches/icedtea-hotspot-original-memory-limits.patch | 21
patches/icedtea-hotspot-original-params-cast-size_t.patch | 121
patches/icedtea-hotspot-original-shark-build.patch | 232
patches/icedtea-hotspot-original-sparc-ptracefix.patch | 34
patches/icedtea-hotspot-original-sparc-trapsfix.patch | 21
patches/icedtea-hotspot-original-sparc64-linux.patch | 93
patches/icedtea-hotspot-original-static-libstdc++.patch | 33
patches/icedtea-hotspot-original-text-relocations.patch | 25
patches/icedtea-hotspot-original-use-idx_t.patch | 282
patches/icedtea-hotspot-original-version.patch | 36
patches/icedtea-hotspot-original-zero-build.patch | 133
patches/icedtea-xrender-000.patch | 430
patches/icedtea-xrender-001.patch | 5320 ------------
patches/icedtea-xrender-002.patch | 5199 -----------
patches/icedtea-xrender-003.patch | 78
patches/icedtea-xrender-004.patch | 86
patches/icedtea-xrender-005.patch | 18
patches/icedtea-xrender-006.patch | 295
patches/icedtea-xrender-007.patch | 1143 --
patches/icedtea-xrender-008.patch | 131
patches/icedtea-xrender-009.patch | 170
patches/security/icedtea-4486841.patch | 1234 ++
patches/security/icedtea-6484091.patch | 129
patches/security/icedtea-6497740.patch | 1587 +++
patches/security/icedtea-6588160.patch | 42
patches/security/icedtea-6592792.patch | 360
patches/security/icedtea-6721753.patch | 116
patches/security/icedtea-6726779.patch | 142
patches/security/icedtea-6733959.patch | 231
patches/security/icedtea-6734167.patch | 89
patches/security/icedtea-6755943.patch | 617 +
patches/security/icedtea-6766136.patch | 189
patches/xrender/icedtea-000.patch | 430
patches/xrender/icedtea-001.patch | 5320 ++++++++++++
patches/xrender/icedtea-002.patch | 5199 +++++++++++
patches/xrender/icedtea-003.patch | 78
patches/xrender/icedtea-004.patch | 86
patches/xrender/icedtea-005.patch | 18
patches/xrender/icedtea-006.patch | 295
patches/xrender/icedtea-007.patch | 1143 ++
patches/xrender/icedtea-008.patch | 131
patches/xrender/icedtea-009.patch | 170
diffs (truncated from 42972 to 500 lines):
diff -r 5e60b6dd0bf6 -r a59dccb92ae7 ChangeLog
--- a/ChangeLog Wed Dec 03 04:52:28 2008 -0500
+++ b/ChangeLog Wed Dec 03 14:31:01 2008 +0000
@@ -1,3 +1,132 @@ 2008-12-03 Gary Benson <gbenson at redhat
+2008-12-03 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ Create hierarchical patch space.
+ * patches/icedtea-4486841.patch,
+ * patches/icedtea-6484091.patch,
+ * patches/icedtea-6497740.patch,
+ * patches/icedtea-6588160.patch,
+ * patches/icedtea-6592792.patch,
+ * patches/icedtea-6721753.patch,
+ * patches/icedtea-6726779.patch,
+ * patches/icedtea-6733959.patch,
+ * patches/icedtea-6734167.patch,
+ * patches/icedtea-6755943.patch,
+ * patches/icedtea-6766136.patch,
+ * patches/icedtea-ecj-hotspot-14.0b08.patch,
+ * patches/icedtea-ecj-hotspot-original.patch,
+ * patches/icedtea-ecj-jopt.patch,
+ * patches/icedtea-ecj-pr261.patch,
+ * patches/icedtea-ecj-spp.patch,
+ * patches/icedtea-ecj.patch,
+ * patches/icedtea-hotspot-14.0b08-bytecodeInterpreter.patch,
+ * patches/icedtea-hotspot-14.0b08-core-build.patch,
+ * patches/icedtea-hotspot-14.0b08-debuginfo.patch,
+ * patches/icedtea-hotspot-14.0b08-gcc-4.3.patch,
+ * patches/icedtea-hotspot-14.0b08-gcc-suffix.patch,
+ * patches/icedtea-hotspot-14.0b08-headers.patch,
+ * patches/icedtea-hotspot-14.0b08-memory-limits.patch,
+ * patches/icedtea-hotspot-14.0b08-params-cast-size_t.patch,
+ * patches/icedtea-hotspot-14.0b08-shark-build.patch,
+ * patches/icedtea-hotspot-14.0b08-sparc-ptracefix.patch,
+ * patches/icedtea-hotspot-14.0b08-sparc-trapsfix.patch,
+ * patches/icedtea-hotspot-14.0b08-sparc64-linux.patch,
+ * patches/icedtea-hotspot-14.0b08-static-libstdc++.patch,
+ * patches/icedtea-hotspot-14.0b08-text-relocations.patch,
+ * patches/icedtea-hotspot-14.0b08-use-idx_t.patch,
+ * patches/icedtea-hotspot-14.0b08-version.patch,
+ * patches/icedtea-hotspot-14.0b08-zero-build.patch,
+ * patches/icedtea-hotspot-original-bytecodeInterpreter.patch,
+ * patches/icedtea-hotspot-original-core-build.patch,
+ * patches/icedtea-hotspot-original-debuginfo.patch,
+ * patches/icedtea-hotspot-original-gcc-4.3.patch,
+ * patches/icedtea-hotspot-original-gcc-suffix.patch,
+ * patches/icedtea-hotspot-original-headers.patch,
+ * patches/icedtea-hotspot-original-memory-limits.patch,
+ * patches/icedtea-hotspot-original-params-cast-size_t.patch,
+ * patches/icedtea-hotspot-original-shark-build.patch,
+ * patches/icedtea-hotspot-original-sparc-ptracefix.patch,
+ * patches/icedtea-hotspot-original-sparc-trapsfix.patch,
+ * patches/icedtea-hotspot-original-sparc64-linux.patch,
+ * patches/icedtea-hotspot-original-static-libstdc++.patch,
+ * patches/icedtea-hotspot-original-text-relocations.patch,
+ * patches/icedtea-hotspot-original-use-idx_t.patch,
+ * patches/icedtea-hotspot-original-version.patch,
+ * patches/icedtea-hotspot-original-zero-build.patch,
+ * patches/icedtea-xrender-000.patch,
+ * patches/icedtea-xrender-001.patch,
+ * patches/icedtea-xrender-002.patch,
+ * patches/icedtea-xrender-003.patch,
+ * patches/icedtea-xrender-004.patch,
+ * patches/icedtea-xrender-005.patch,
+ * patches/icedtea-xrender-006.patch,
+ * patches/icedtea-xrender-007.patch,
+ * patches/icedtea-xrender-008.patch,
+ * patches/icedtea-xrender-009.patch:
+ Move patches...
+ * Makefile.am: Fixed paths.
+ * patches/ecj/icedtea-hotspot-14.0b08.patch,
+ * patches/ecj/icedtea-hotspot-original.patch,
+ * patches/ecj/icedtea-jopt.patch,
+ * patches/ecj/icedtea-pr261.patch,
+ * patches/ecj/icedtea-spp.patch,
+ * patches/ecj/icedtea.patch,
+ * patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch,
+ * patches/hotspot/14.0b08/icedtea-core-build.patch,
+ * patches/hotspot/14.0b08/icedtea-debuginfo.patch,
+ * patches/hotspot/14.0b08/icedtea-gcc-4.3.patch,
+ * patches/hotspot/14.0b08/icedtea-gcc-suffix.patch,
+ * patches/hotspot/14.0b08/icedtea-headers.patch,
+ * patches/hotspot/14.0b08/icedtea-memory-limits.patch,
+ * patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/14.0b08/icedtea-shark-build.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc64-linux.patch,
+ * patches/hotspot/14.0b08/icedtea-static-libstdc++.patch,
+ * patches/hotspot/14.0b08/icedtea-text-relocations.patch,
+ * patches/hotspot/14.0b08/icedtea-use-idx_t.patch,
+ * patches/hotspot/14.0b08/icedtea-version.patch,
+ * patches/hotspot/14.0b08/icedtea-zero-build.patch,
+ * patches/hotspot/original/icedtea-bytecodeInterpreter.patch,
+ * patches/hotspot/original/icedtea-core-build.patch,
+ * patches/hotspot/original/icedtea-debuginfo.patch,
+ * patches/hotspot/original/icedtea-gcc-4.3.patch,
+ * patches/hotspot/original/icedtea-gcc-suffix.patch,
+ * patches/hotspot/original/icedtea-headers.patch,
+ * patches/hotspot/original/icedtea-memory-limits.patch,
+ * patches/hotspot/original/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/original/icedtea-shark-build.patch,
+ * patches/hotspot/original/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/original/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/original/icedtea-sparc64-linux.patch,
+ * patches/hotspot/original/icedtea-static-libstdc++.patch,
+ * patches/hotspot/original/icedtea-text-relocations.patch,
+ * patches/hotspot/original/icedtea-use-idx_t.patch,
+ * patches/hotspot/original/icedtea-version.patch,
+ * patches/hotspot/original/icedtea-zero-build.patch,
+ * patches/security/icedtea-4486841.patch,
+ * patches/security/icedtea-6484091.patch,
+ * patches/security/icedtea-6497740.patch,
+ * patches/security/icedtea-6588160.patch,
+ * patches/security/icedtea-6592792.patch,
+ * patches/security/icedtea-6721753.patch,
+ * patches/security/icedtea-6726779.patch,
+ * patches/security/icedtea-6733959.patch,
+ * patches/security/icedtea-6734167.patch,
+ * patches/security/icedtea-6755943.patch,
+ * patches/security/icedtea-6766136.patch,
+ * patches/xrender/icedtea-000.patch,
+ * patches/xrender/icedtea-001.patch,
+ * patches/xrender/icedtea-002.patch,
+ * patches/xrender/icedtea-003.patch,
+ * patches/xrender/icedtea-004.patch,
+ * patches/xrender/icedtea-005.patch,
+ * patches/xrender/icedtea-006.patch,
+ * patches/xrender/icedtea-007.patch,
+ * patches/xrender/icedtea-008.patch,
+ * patches/xrender/icedtea-009.patch:
+ ...to here.
+
2008-12-03 Gary Benson <gbenson at redhat.com>
* .hgignore: Ignore downloaded HotSpot tarball.
diff -r 5e60b6dd0bf6 -r a59dccb92ae7 Makefile.am
--- a/Makefile.am Wed Dec 03 04:52:28 2008 -0500
+++ b/Makefile.am Wed Dec 03 14:31:01 2008 +0000
@@ -452,13 +452,13 @@ if GCC_OLD
GCC_PATCH =
else
GCC_PATCH = patches/icedtea-gcc-4.3.patch \
- patches/icedtea-hotspot-$(HSBUILD)-gcc-4.3.patch
+ patches/hotspot/$(HSBUILD)/icedtea-gcc-4.3.patch
endif
# If ZERO_BUILD is set then we are building zero and need
# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
ZERO_PATCHES = \
- patches/icedtea-hotspot-$(HSBUILD)-bytecodeInterpreter.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \
patches/icedtea-signature-iterator.patch \
patches/icedtea-test-atomic-operations.patch \
patches/icedtea-zero.patch \
@@ -501,12 +501,12 @@ ICEDTEA_PATCHES = \
ICEDTEA_PATCHES = \
$(ZERO_PATCHES_COND) \
patches/icedtea-version.patch \
- patches/icedtea-hotspot-$(HSBUILD)-version.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-version.patch \
patches/icedtea-copy-plugs.patch \
- patches/icedtea-hotspot-$(HSBUILD)-text-relocations.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
patches/icedtea-graphics.patch \
patches/icedtea-debuginfo.patch \
- patches/icedtea-hotspot-$(HSBUILD)-debuginfo.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-debuginfo.patch \
patches/icedtea-ssl.patch \
$(PLUGIN_PATCH) \
patches/icedtea-webstart.patch \
@@ -516,36 +516,36 @@ ICEDTEA_PATCHES = \
patches/icedtea-demos.patch \
patches/icedtea-use-system-tzdata.patch \
patches/icedtea-headers.patch \
- patches/icedtea-hotspot-$(HSBUILD)-headers.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-headers.patch \
patches/icedtea-ant.patch \
patches/icedtea-gcc-suffix.patch \
- patches/icedtea-hotspot-$(HSBUILD)-gcc-suffix.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/icedtea-float-double-trailing-zeros.patch \
- patches/icedtea-hotspot-$(HSBUILD)-memory-limits.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
patches/icedtea-core-build.patch \
- patches/icedtea-hotspot-$(HSBUILD)-core-build.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-core-build.patch \
patches/icedtea-linker-options.patch \
- patches/icedtea-hotspot-$(HSBUILD)-static-libstdc++.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \
patches/icedtea-timerqueue.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
- patches/icedtea-hotspot-$(HSBUILD)-zero-build.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-fonts.patch \
- patches/icedtea-hotspot-$(HSBUILD)-sparc64-linux.patch \
- patches/icedtea-hotspot-$(HSBUILD)-sparc-ptracefix.patch \
- patches/icedtea-hotspot-$(HSBUILD)-sparc-trapsfix.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
patches/icedtea-no-bcopy.patch \
patches/icedtea-shark-build.patch \
- patches/icedtea-hotspot-$(HSBUILD)-shark-build.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-nomotif-6706121.patch \
@@ -554,8 +554,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-alt-jar.patch \
patches/icedtea-enum-bug-181.patch \
patches/icedtea-jdk-use-ssize_t.patch \
- patches/icedtea-hotspot-$(HSBUILD)-use-idx_t.patch \
- patches/icedtea-hotspot-$(HSBUILD)-params-cast-size_t.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \
patches/icedtea-clean-crypto.patch \
$(SHARK_PATCH) \
$(GCC_PATCH) \
@@ -576,17 +576,17 @@ ICEDTEA_PATCHES = \
patches/icedtea-testenv.patch \
patches/icedtea-samejvm-safe.patch \
patches/icedtea-6728542-epoll.patch \
- patches/icedtea-4486841.patch \
- patches/icedtea-6484091.patch \
- patches/icedtea-6497740.patch \
- patches/icedtea-6588160.patch \
- patches/icedtea-6592792.patch \
- patches/icedtea-6721753.patch \
- patches/icedtea-6726779.patch \
- patches/icedtea-6733959.patch \
- patches/icedtea-6734167.patch \
- patches/icedtea-6755943.patch \
- patches/icedtea-6766136.patch
+ patches/security/icedtea-4486841.patch \
+ patches/security/icedtea-6484091.patch \
+ patches/security/icedtea-6497740.patch \
+ patches/security/icedtea-6588160.patch \
+ patches/security/icedtea-6592792.patch \
+ patches/security/icedtea-6721753.patch \
+ patches/security/icedtea-6726779.patch \
+ patches/security/icedtea-6733959.patch \
+ patches/security/icedtea-6734167.patch \
+ patches/security/icedtea-6755943.patch \
+ patches/security/icedtea-6766136.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -618,7 +618,7 @@ endif
endif
if ENABLE_XRENDER
-XRENDER_PATCHES = patches/icedtea-xrender-???.patch
+XRENDER_PATCHES = patches/xrender/icedtea-???.patch
ICEDTEA_PATCHES += $(sort $(wildcard $(XRENDER_PATCHES)))
endif
@@ -843,11 +843,11 @@ stamps/ports-ecj.stamp: stamps/extract-e
touch stamps/ports-ecj.stamp
# Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCHES = patches/icedtea-ecj.patch \
- patches/icedtea-ecj-hotspot-$(HSBUILD).patch \
- patches/icedtea-ecj-spp.patch \
- patches/icedtea-ecj-jopt.patch \
- patches/icedtea-ecj-pr261.patch
+ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
+ patches/ecj/icedtea-hotspot-$(HSBUILD).patch \
+ patches/ecj/icedtea-spp.patch \
+ patches/ecj/icedtea-jopt.patch \
+ patches/ecj/icedtea-pr261.patch
stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
mkdir -p stamps; \
diff -r 5e60b6dd0bf6 -r a59dccb92ae7 patches/ecj/icedtea-hotspot-14.0b08.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-hotspot-14.0b08.patch Wed Dec 03 14:31:01 2008 +0000
@@ -0,0 +1,48 @@
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
+--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100
+@@ -263,28 +263,24 @@
+
+ $(TARGETS_C2): $(SUBDIRS_C2)
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_TIERED): $(SUBDIRS_TIERED)
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_C1): $(SUBDIRS_C1)
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_CORE): $(SUBDIRS_CORE)
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100
+@@ -74,8 +74,8 @@
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
+
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+
+
diff -r 5e60b6dd0bf6 -r a59dccb92ae7 patches/ecj/icedtea-hotspot-original.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-hotspot-original.patch Wed Dec 03 14:31:01 2008 +0000
@@ -0,0 +1,45 @@
+diff -Nru openjdk-ecj.orig/hotspot/build/linux/Makefile openjdk-ecj/hotspot/build/linux/Makefile
+--- openjdk-ecj.orig/hotspot/build/linux/Makefile 2008-10-20 18:45:00.000000000 +0100
++++ openjdk-ecj/hotspot/build/linux/Makefile 2008-10-20 18:50:20.000000000 +0100
+@@ -257,28 +257,24 @@
+
+ $(TARGETS_C2): $(SUBDIRS_C2)
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_TIERED): $(SUBDIRS_TIERED)
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_C1): $(SUBDIRS_C1)
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_CORE): $(SUBDIRS_CORE)
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+diff -Nru openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make openjdk-ecj/hotspot/build/linux/makefiles/sa.make
+--- openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make 2008-10-20 18:45:00.000000000 +0100
++++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make 2008-10-20 18:50:20.000000000 +0100
+@@ -72,7 +72,7 @@
+ $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+ $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
+
diff -r 5e60b6dd0bf6 -r a59dccb92ae7 patches/ecj/icedtea-jopt.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-jopt.patch Wed Dec 03 14:31:01 2008 +0000
@@ -0,0 +1,26 @@
+diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2008-10-22 18:45:43.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-10-22 18:49:29.000000000 +0100
+@@ -75,7 +75,9 @@
+ JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
+
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ # langtools is not available.
+diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2008-10-22 19:14:30.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-10-22 19:15:00.000000000 +0100
+@@ -82,7 +82,9 @@
+ JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
+
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ # langtools is not available.
diff -r 5e60b6dd0bf6 -r a59dccb92ae7 patches/ecj/icedtea-pr261.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-pr261.patch Wed Dec 03 14:31:01 2008 +0000
@@ -0,0 +1,40 @@
+diff -r fa4572c7c75f openjdk-ecj/jdk/make/java/nio/Makefile
+--- openjdk-ecj/jdk/make/java/nio/Makefile Thu Nov 27 08:42:23 2008 +0000
++++ openjdk-ecj/jdk/make/java/nio/Makefile Thu Nov 27 10:12:08 2008 +0000
+@@ -85,6 +85,9 @@ ifeq ($(PLATFORM), linux)
+ ifeq ($(PLATFORM), linux)
+ FILES_java += \
+ sun/nio/ch/AbstractPollSelectorImpl.java \
++ sun/nio/ch/DevPollArrayWrapper.java \
++ sun/nio/ch/DevPollSelectorImpl.java \
++ sun/nio/ch/DevPollSelectorProvider.java \
+ sun/nio/ch/EPollArrayWrapper.java \
+ sun/nio/ch/EPollSelectorProvider.java \
+ sun/nio/ch/EPollSelectorImpl.java \
+@@ -99,6 +102,7 @@ FILES_c += \
+ NativeThread.c
+
+ FILES_export += \
++ sun/nio/ch/DevPollArrayWrapper.java \
+ sun/nio/ch/EPollArrayWrapper.java \
+ sun/nio/ch/InheritedChannel.java \
+ sun/nio/ch/NativeThread.java
+diff -r 3ee709488c6c openjdk-ecj/jdk/make/java/nio/FILES_java.gmk
+--- openjdk-ecj/jdk/make/java/nio/FILES_java.gmk Thu Nov 27 10:16:56 2008 +0000
++++ openjdk-ecj/jdk/make/java/nio/FILES_java.gmk Thu Nov 27 11:08:57 2008 +0000
+@@ -31,6 +31,7 @@ FILES_src = \
+ java/nio/StringCharBuffer.java \
+ \
+ java/nio/channels/ByteChannel.java \
++ java/nio/channels/CancelledKeyException.java \
+ java/nio/channels/Channel.java \
+ java/nio/channels/Channels.java \
+ java/nio/channels/DatagramChannel.java \
+@@ -38,6 +39,7 @@ FILES_src = \
+ java/nio/channels/FileLock.java \
+ java/nio/channels/GatheringByteChannel.java \
+ java/nio/channels/InterruptibleChannel.java \
++ java/nio/channels/Pipe.java \
+ java/nio/channels/ReadableByteChannel.java \
+ java/nio/channels/ScatteringByteChannel.java \
+ java/nio/channels/SelectableChannel.java \
diff -r 5e60b6dd0bf6 -r a59dccb92ae7 patches/ecj/icedtea-spp.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-spp.patch Wed Dec 03 14:31:01 2008 +0000
@@ -0,0 +1,65 @@
+diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/spp/Spp.java openjdk-ecj/jdk/make/tools/src/build/tools/spp/Spp.java
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/spp/Spp.java 2008-09-11 08:44:09.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/spp/Spp.java 2008-09-12 21:34:38.000000000 +0100
+@@ -25,6 +25,10 @@
+
+ package build.tools.spp;
+
++import java.io.BufferedReader;
++import java.io.InputStreamReader;
++import java.io.IOException;
++
+ import java.util.*;
+ import java.util.regex.*;
+
+@@ -83,7 +87,7 @@
+ }
+
+ StringBuffer out = new StringBuffer();
+- new Spp().spp(new Scanner(System.in),
++ new Spp().spp(new BufferedReader(new InputStreamReader(System.in)),
+ out, "",
+ keys, vars, be,
+ false);
+@@ -104,12 +108,12 @@
+ Matcher ifkey = Pattern.compile("^#if\\[(!)?" + KEY + "\\]").matcher("");
+ Matcher elsekey = Pattern.compile("^#else\\[(!)?" + KEY + "\\]").matcher("");
+ Matcher endkey = Pattern.compile("^#end\\[(!)?" + KEY + "\\]").matcher("");
+- Matcher vardef = Pattern.compile("\\{#if\\[(!)?" + KEY + "\\]\\?" + TEXT + "(:"+ TEXT + ")?\\}|\\$" + VAR + "\\$").matcher("");
++ Pattern pvardef = Pattern.compile("\\{#if\\[(!)?" + KEY + "\\]\\?" + TEXT + "(:"+ TEXT + ")?\\}|\\$" + VAR + "\\$");
+ Matcher vardef2 = Pattern.compile("\\$" + VAR + "\\$").matcher("");
+
+ void append(StringBuffer buf, String ln,
+ Set<String> keys, Map<String, String> vars) {
+- vardef.reset(ln);
++ Matcher vardef = pvardef.matcher(ln);
+ while (vardef.find()) {
+ String repl = "";
More information about the distro-pkg-dev
mailing list