/hg/icedtea6-hg: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sun Nov 14 05:53:45 PST 2010
changeset ad1c77031a41 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ad1c77031a41
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Nov 12 18:17:22 2010 +0000
Cleanup new fonts target.
2010-11-12 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-local): Add clean-fonts.
(.PHONY): Likewise. (clean-fonts): Remove fonts.stamp.
changeset 6246db42e88c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6246db42e88c
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Nov 14 13:53:05 2010 +0000
Merge
diffstat:
100 files changed, 612 insertions(+), 24755 deletions(-)
ChangeLog | 181
Makefile.am | 105
acinclude.m4 | 4
hotspot.map | 2
patches/alpha-fixes.patch | 21
patches/gcc-suffix.patch | 31
patches/hotspot/hs19/alpha-fixes.patch | 21
patches/hotspot/hs19/gcc-suffix.patch | 31
patches/hotspot/hs19/params-cast-size_t.patch | 284 -
patches/hotspot/hs19/print_lsb_release.patch | 49
patches/hotspot/hs19/update-bootclasspath.patch | 13
patches/hotspot/original/alpha-fixes.patch | 31
patches/hotspot/original/gcc-suffix.patch | 25
patches/hotspot/original/params-cast-size_t.patch | 274
patches/hotspot/original/print_lsb_release.patch | 48
patches/hotspot/original/update-bootclasspath.patch | 13
patches/icedtea-jtreg-jrunscript.patch | 12
patches/icedtea-lcms.patch | 25
patches/icedtea-shark-build.patch | 16
patches/openjdk/4356282-opentype.patch | 227
patches/openjdk/6438179-systray_check.patch | 92
patches/openjdk/6622432-bigdecimal_performance.patch | 4211 ---------------
patches/openjdk/6678385-window_movement_crasher.patch | 1241 ----
patches/openjdk/6721088-awt_window_size.patch | 67
patches/openjdk/6795060-icu_crash.patch | 95
patches/openjdk/6850606-bigdecimal_regression.patch | 144
patches/openjdk/6853592-badwindow-warning-fix.patch | 16
patches/openjdk/6876282-bigdecimal_divide.patch | 89
patches/openjdk/6951319-sparc_build_fixes.patch | 24
patches/openjdk/6954424-opentype_javadoc.patch | 23
patches/openjdk/6961732-negative_leading.patch | 45
patches/openjdk/6969395-net_bugs.patch | 461 -
patches/openjdk/6985992-test_6933784.patch | 43
patches/params-cast-size_t.patch | 284 +
patches/print_lsb_release.patch | 49
patches/security/20101012/6559775.patch | 317 -
patches/security/20101012/6622002.patch | 64
patches/security/20101012/6623943.patch | 138
patches/security/20101012/6891766.patch | 1147 ----
patches/security/20101012/6914943.patch | 2129 -------
patches/security/20101012/6925710.patch | 198
patches/security/20101012/6938813.patch | 196
patches/security/20101012/6952017.patch | 50
patches/security/20101012/6952603.patch | 38
patches/security/20101012/6957564.patch | 77
patches/security/20101012/6958060.patch | 15
patches/security/20101012/6961084.patch | 325 -
patches/security/20101012/6963023.patch | 95
patches/security/20101012/6963285.patch | 20
patches/security/20101012/6963489.patch | 31
patches/security/20101012/6966692.patch | 91
patches/security/20101012/6981426.patch | 24
patches/security/20101012/6990437.patch | 116
patches/update-bootclasspath.patch | 13
shark/hotspot/make/linux/makefiles/shark.make | 32
shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 62
shark/hotspot/src/share/vm/includeDB_shark | 369 -
shark/hotspot/src/share/vm/shark/llvmHeaders.hpp | 82
shark/hotspot/src/share/vm/shark/llvmValue.hpp | 62
shark/hotspot/src/share/vm/shark/sharkBlock.cpp | 1260 ----
shark/hotspot/src/share/vm/shark/sharkBlock.hpp | 281 -
shark/hotspot/src/share/vm/shark/sharkBuilder.cpp | 591 --
shark/hotspot/src/share/vm/shark/sharkBuilder.hpp | 209
shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 259
shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 417 -
shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 87
shark/hotspot/src/share/vm/shark/sharkCompiler.cpp | 340 -
shark/hotspot/src/share/vm/shark/sharkCompiler.hpp | 119
shark/hotspot/src/share/vm/shark/sharkConstant.cpp | 128
shark/hotspot/src/share/vm/shark/sharkConstant.hpp | 64
shark/hotspot/src/share/vm/shark/sharkContext.cpp | 180
shark/hotspot/src/share/vm/shark/sharkContext.hpp | 187
shark/hotspot/src/share/vm/shark/sharkEntry.hpp | 58
shark/hotspot/src/share/vm/shark/sharkFunction.cpp | 188
shark/hotspot/src/share/vm/shark/sharkFunction.hpp | 111
shark/hotspot/src/share/vm/shark/sharkInliner.cpp | 749 --
shark/hotspot/src/share/vm/shark/sharkInliner.hpp | 32
shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | 277
shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp | 54
shark/hotspot/src/share/vm/shark/sharkInvariants.cpp | 37
shark/hotspot/src/share/vm/shark/sharkInvariants.hpp | 167
shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp | 116
shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp | 88
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 352 -
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp | 182
shark/hotspot/src/share/vm/shark/sharkRuntime.cpp | 251
shark/hotspot/src/share/vm/shark/sharkRuntime.hpp | 83
shark/hotspot/src/share/vm/shark/sharkStack.cpp | 263
shark/hotspot/src/share/vm/shark/sharkStack.hpp | 290 -
shark/hotspot/src/share/vm/shark/sharkState.cpp | 389 -
shark/hotspot/src/share/vm/shark/sharkState.hpp | 188
shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 99
shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 75
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 1991 -------
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 430 -
shark/hotspot/src/share/vm/shark/sharkType.hpp | 112
shark/hotspot/src/share/vm/shark/sharkValue.cpp | 260
shark/hotspot/src/share/vm/shark/sharkValue.hpp | 332 -
shark/hotspot/src/share/vm/shark/shark_globals.cpp | 29
shark/hotspot/src/share/vm/shark/shark_globals.hpp | 54
diffs (truncated from 26022 to 500 lines):
diff -r 5772aff6fc53 -r 6246db42e88c ChangeLog
--- a/ChangeLog Thu Nov 11 21:01:13 2010 +0100
+++ b/ChangeLog Sun Nov 14 13:53:05 2010 +0000
@@ -1,6 +1,31 @@ 2010-11-11 Stefan Ring <stefan at complan
+2010-11-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-local): Add clean-fonts.
+ (.PHONY): Likewise.
+ (clean-fonts): Remove fonts.stamp.
+
+2010-11-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6622432-bigdecimal_performance.patch,
+ * patches/openjdk/6850606-bigdecimal_regression.patch,
+ * patches/openjdk/6876282-bigdecimal_divide.patch:
+ Removed, upstream.
+ * Makefile.am: Add patch below.
+ * patches/6703377-freetypescaler.patch:
+ Added back, not upstream (this is NOT 6703377, but
+ an addendum to it).
+
2010-11-11 Stefan Ring <stefan at complang.tuwien.ac.at>
* Makefile.am: Upgrade CACAO version, use .tar.gz archive
+
+2010-11-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/6703377-freetypescaler.patch,
+ * patches/openjdk/6853592-badwindow-warning-fix.patch:
+ Drop patches applied upstream.
+ * Makefile.am: Drop above patches.
2010-11-11 Stefan Ring <stefan at complang.tuwien.ac.at>
@@ -129,6 +154,110 @@ 2010-10-20 Andrew John Hughes <ahughes
the conditional and for --without-hotspot-build.
Use DEFAULT_BUILD only for when the option is
not specified.
+
+2010-10-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/security/20101012/6559775.patch,
+ * patches/security/20101012/6622002.patch,
+ * patches/security/20101012/6891766.patch,
+ * patches/security/20101012/6914943.patch,
+ * patches/security/20101012/6925710.patch,
+ * patches/security/20101012/6938813.patch,
+ * patches/security/20101012/6952017.patch,
+ * patches/security/20101012/6952603.patch,
+ * patches/security/20101012/6957564.patch,
+ * patches/security/20101012/6958060.patch,
+ * patches/security/20101012/6961084.patch,
+ * patches/security/20101012/6963023.patch,
+ * patches/security/20101012/6963285.patch,
+ * patches/security/20101012/6963489.patch,
+ * patches/security/20101012/6966692.patch,
+ * patches/security/20101012/6981426.patch,
+ * patches/security/20101012/6990437.patch:
+ Dropped; available upstream.
+ * Makefile.am: Drop above patches.
+ * patches/icedtea-lcms.patch: Rejigged against
+ upstream security patch.
+
+2010-10-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/hs19/alpha-fixes.patch,
+ * patches/hotspot/hs19/gcc-suffix.patch,
+ * patches/hotspot/hs19/params-cast-size_t.patch,
+ * patches/hotspot/hs19/print_lsb_release.patch,
+ * patches/hotspot/hs19/update-bootclasspath.patch:
+ Move to patches. hs19 is now the only option.
+ * patches/hotspot/original/alpha-fixes.patch,
+ * patches/hotspot/original/gcc-suffix.patch,
+ * patches/hotspot/original/params-cast-size_t.patch,
+ * patches/hotspot/original/print_lsb_release.patch,
+ * patches/hotspot/original/update-bootclasspath.patch:
+ Dropped; upstream moved from hs17 to hs19.
+ * patches/icedtea-shark-build.patch:
+ Applied upstream by Gary Benson.
+ * patches/security/20101012/6623943.patch:
+ Applied upstream by Omair Majid.
+ * shark/hotspot/make/linux/makefiles/shark.make,
+ * shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
+ * shark/hotspot/src/share/vm/includeDB_shark,
+ * shark/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+ * shark/hotspot/src/share/vm/shark/llvmValue.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkBlock.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkBlock.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkBuilder.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkBuilder.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkCompiler.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkCompiler.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkConstant.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkConstant.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkContext.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkContext.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkEntry.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkFunction.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkFunction.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkInliner.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkInliner.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkInvariants.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkInvariants.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkRuntime.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkRuntime.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkStack.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkStack.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkState.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkState.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkType.hpp,
+ * shark/hotspot/src/share/vm/shark/sharkValue.cpp,
+ * shark/hotspot/src/share/vm/shark/sharkValue.hpp,
+ * shark/hotspot/src/share/vm/shark/shark_globals.cpp,
+ * shark/hotspot/src/share/vm/shark/shark_globals.hpp:
+ Shark is in HotSpot 19.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove $(HSBUILD) special casing.
+ Remove conditional !WITH_ALT_HSBUILD patches.
+ (ports): Drop !WITH_ALT_HSBUILD block.
+ (clean-ports): Likewise.
+ * hotspot.map: Remove hs19.
+ * patches/alpha-fixes.patch,
+ * patches/gcc-suffix.patch,
+ * patches/params-cast-size_t.patch,
+ * patches/print_lsb_release.patch,
+ * patches/update-bootclasspath.patch:
+ The hs19 patches moved above.
+ * acinclude.m4:
+ (AC_CHECK_WITH_HOTSPOT_BUILD): Default to original.
2010-10-19 Andrew John Hughes <ahughes at redhat.com>
@@ -414,7 +543,6 @@ 2010-10-19 Andrew John Hughes <ahughes
(extra-lib/about.jar): Likewise.
(ADD_ZERO_CONFIGURE_ARGS): Remove dead --disable-plugin.
(plugin-tests): Removed.
- * acinclude.m4:
(IT_CHECK_PLUGIN): Removed.
(IT_CHECK_PLUGIN_DEPENDENCIES): Likewise.
(IT_CHECK_XULRUNNER_VERSION): Likewise.
@@ -676,6 +804,14 @@ 2010-09-23 Andrew John Hughes <ahughes
* Makefile.am: Fix path of above patch.
* patches/openjdk/6721088-awt_window_size.patch,
...here to reflect upstreaming.
+
+2010-09-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-awt-window-size.patch,
+ * patches/openjdk/6969395-net_bugs.patch,
+ * patches/openjdk/6985992-test_6933784.patch:
+ Dropped; upstreamed.
+ * Makefile.am: Remove above patches.
2010-09-23 Andrew John Hughes <ahughes at redhat.com>
@@ -1016,6 +1152,15 @@ 2010-09-07 Andrew John Hughes <ahughes
* patches/openjdk/6969395-net_bugs.patch:
Fix networking tests.
+2010-09-05 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6438179-systray_check.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Drop above patch and those brought
+ back by merge. Update JAXP tarball.
+ * patches/openjdk/6951319-sparc_build_fixes.patch:
+ Remove upstreamed parts.
+
2010-09-03 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: Fixed indentation, changes spaces to tab.
@@ -1065,7 +1210,7 @@ 2010-08-27 Deepak Bhole <dbhole at redhat.
2010-08-26 Pavel Tisnovsky <ptisnovs at redhat.com>
- * Makefile.am:
+ * Makefile.am: Add patch.
* patches/opengl-jni-fix.patch:
Fixed missing JNI link to native function
OGLContext.getOGLIdString() which causes
@@ -1152,6 +1297,22 @@ 2010-08-13 Andrew John Hughes <ahughes
an Oracle-based JDK or not.
* configure.ac:
Remove check for sun.awt.Toolkit.
+
+2010-08-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/4356282-opentype.patch,
+ * patches/openjdk/6795060-icu_crash.patch,
+ * patches/openjdk/6954424-opentype_javadoc.patch:
+ Dropped, applied upstream.
+ * Makefile.am:
+ Remove above patches.
+
+2010-08-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6678385-window_movement_crasher.patch:
+ Dropped, applied upstream.
+ * Makefile.am:
+ Remove above patch.
2010-08-09 Omair Majid <omajid at redhat.com>
@@ -1193,7 +1354,7 @@ 2010-08-09 Deepak Bhole <dbhole at redhat.
* Makefile.am:
(icedtea):Add update-bootclasspath.patch.
dependencies and copying. Add icedtea-update-bootclasspath.patch.
- * patches/update-bootclasspath.patch: New patch. Adds netx,
+ * patches/update-bootclasspath.patch: New patch. Adds netx,
rhino and plugin jars to the bootclasspath.
2010-08-09 Andrew John Hughes <ahughes at redhat.com>
@@ -1505,6 +1666,12 @@ 2010-07-28 Matthias Klose <doko at ubuntu
2010-07-28 Matthias Klose <doko at ubuntu.com>
* NEWS: Add 1.8.1 entry.
+
+2010-07-26 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-jtreg-jrunscript.patch:
+ Regenerate after 50002bfcff96 from dcubed being
+ added to OpenJDK6.
2010-07-26 Andrew John Hughes <ahughes at redhat.com>
@@ -1954,6 +2121,12 @@ 2010-07-08 Andrew John Hughes <ahughes
just delete the stamp.
(clean-extract-openjdk): Likewise for clean-patch and
clean-patch-fsg.
+
+2010-07-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6961732.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Remove above patch.
2010-07-06 Andrew John Hughes <ahughes at redhat.com>
@@ -10247,7 +10420,7 @@ 2009-04-07 Omair Majid <omajid at redhat.
2009-04-06 Omair Majid <omajid at redhat.com>
- * patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
+ * patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
jrunscriptTest.sh with a java version that isnt picky about int vs double
changes.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
diff -r 5772aff6fc53 -r 6246db42e88c Makefile.am
--- a/Makefile.am Thu Nov 11 21:01:13 2010 +0100
+++ b/Makefile.am Sun Nov 14 13:53:05 2010 +0000
@@ -18,8 +18,8 @@ JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jdk6-jaxp-b20.zip
-JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
+JAXP_DROP_ZIP = jaxp-1_4_4.zip
+JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
@@ -174,27 +174,7 @@ REWRITER_SRCS = $(abs_top_srcdir)/rewrit
ICEDTEA_FSG_PATCHES =
-BROKEN =
-
-SECURITY_PATCHES = \
- patches/security/20101012/6891766.patch \
- patches/security/20101012/6925710.patch \
- patches/security/20101012/6938813.patch \
- patches/security/20101012/6957564.patch \
- patches/security/20101012/6958060.patch \
- patches/security/20101012/6963023.patch \
- patches/security/20101012/6963489.patch \
- patches/security/20101012/6966692.patch \
- patches/security/20101012/6914943.patch \
- patches/security/20101012/6559775.patch \
- patches/security/20101012/6622002.patch \
- patches/security/20101012/6623943.patch \
- patches/security/20101012/6952017.patch \
- patches/security/20101012/6952603.patch \
- patches/security/20101012/6961084.patch \
- patches/security/20101012/6963285.patch \
- patches/security/20101012/6981426.patch \
- patches/security/20101012/6990437.patch
+SECURITY_PATCHES =
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
@@ -211,7 +191,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-headers.patch \
patches/icedtea-headers-hotspot.patch \
patches/icedtea-gcc-suffix.patch \
- patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
+ patches/gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/memory-limits.patch \
patches/icedtea-sunsrc.patch \
@@ -219,18 +199,18 @@ ICEDTEA_PATCHES = \
patches/icedtea-javafiles.patch \
patches/icedtea-jvmtiEnv.patch \
patches/icedtea-lcms.patch \
- patches/hotspot/$(HSBUILD)/print_lsb_release.patch \
+ patches/print_lsb_release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
patches/icedtea-freetypeversion.patch \
patches/icedtea-nomotif-6706121.patch \
patches/icedtea-nomotif.patch \
patches/icedtea-nomotif-mtoolkit.patch \
- patches/hotspot/$(HSBUILD)/alpha-fixes.patch \
+ patches/alpha-fixes.patch \
patches/icedtea-alt-jar.patch \
patches/icedtea-jdk-use-ssize_t.patch \
patches/icedtea-use-idx_t.patch \
- patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \
+ patches/params-cast-size_t.patch \
patches/icedtea-clean-crypto.patch \
patches/icedtea-arch.patch \
patches/icedtea-lc_ctype.patch \
@@ -246,7 +226,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-demo-swingapplet.patch \
- patches/openjdk/6721088-awt_window_size.patch \
patches/icedtea-jtreg-6592792.patch \
patches/icedtea-s390-noinline.patch \
patches/icedtea-jtreg-dnd.patch \
@@ -262,14 +241,12 @@ ICEDTEA_PATCHES = \
patches/icedtea-parisc.patch \
patches/icedtea-sh4-support.patch \
patches/icedtea-policy-evaluation.patch \
- patches/hotspot/$(HSBUILD)/update-bootclasspath.patch \
+ patches/update-bootclasspath.patch \
patches/libpng.patch \
patches/extensions/netx.patch \
patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
- patches/openjdk/6678385-window_movement_crasher.patch \
- patches/openjdk/6961732-negative_leading.patch \
patches/debug-dir.patch \
patches/no-sync.patch \
patches/icedtea-override-redirect-metacity.patch \
@@ -279,44 +256,20 @@ ICEDTEA_PATCHES = \
patches/fonts-rhel.patch \
patches/fonts-gentoo.patch \
patches/ipv4-mapped-ipv6-addresses.patch \
- patches/openjdk/6795060-icu_crash.patch \
- patches/openjdk/4356282-opentype.patch \
- patches/openjdk/6954424-opentype_javadoc.patch \
- patches/openjdk/6438179-systray_check.patch \
patches/icedtea-too-many-args.patch \
patches/icedtea-jtreg-OpenGLContextInit.patch \
- patches/openjdk/6969395-net_bugs.patch \
patches/openjdk/6510892-httpserver_test.patch \
patches/openjdk/6638712-wildcard_types.patch \
patches/openjdk/6650759-missing_inference.patch \
patches/numa_on_early_glibc.patch \
- patches/icedtea-shark-build.patch \
- patches/openjdk/6985992-test_6933784.patch \
- patches/openjdk/6853592-badwindow-warning-fix.patch \
- patches/6703377-freetypescaler.patch \
patches/icedtea-jtreg-international-fonts.patch \
patches/openjdk/6967436-6976265-6967434-pisces.patch \
patches/openjdk/6997495-test_correction_6857159.patch \
- patches/openjdk/6622432-bigdecimal_performance.patch \
- patches/openjdk/6850606-bigdecimal_regression.patch \
- patches/openjdk/6876282-bigdecimal_divide.patch \
- patches/f14-fonts.patch
-
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += \
- patches/openjdk/6994130-ppc_fix.patch \
+ patches/openjdk/6994130-ppc_fix.patch
+ patches/f14-fonts.patch \
patches/disable-default-compoops.patch \
- patches/openjdk/6980392-fix_test6581734.patch
-else
-ICEDTEA_PATCHES += \
- patches/shark_do_nothing_on_stub_frame.patch \
- patches/icedtea-shark-build-hotspot.patch \
- patches/shark.patch \
- patches/shark-debug-option.patch \
- patches/icedtea-shark.patch \
- patches/icedtea-linux-separate-debuginfo.patch \
- patches/openjdk/6951319-sparc_build_fixes.patch
-endif
+ patches/openjdk/6980392-fix_test6581734.patch \
+ patches/6703377-freetypescaler.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -558,7 +511,7 @@ clean-local: clean-jtreg clean-jtreg-rep
clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \
clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
- clean-bootstrap-directory-symlink-ecj
+ clean-bootstrap-directory-symlink-ecj clean-fonts
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -593,7 +546,7 @@ install:
clean-rewriter clean-rewrite-rhino clean-add-systemtap clean-add-systemtap-debug \
clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-systemtap-ecj \
- clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj
+ clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts
env:
@echo 'unset JAVA_HOME'
@@ -898,23 +851,6 @@ clean-replace-hotspot:
# Copy ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
-if !WITH_ALT_HSBUILD
- for target in $(abs_top_srcdir)/shark/hotspot/make/*/makefiles/* \
- $(abs_top_srcdir)/shark/hotspot/src/*cpu/* \
- $(abs_top_srcdir)/shark/hotspot/src/share/vm/*; do \
- link=$$(dirname $$target | sed 's/^.*shark/openjdk/'); \
- cp -rv $$target $$link; \
- done
- if ! test "x$(WITH_CACAO)" = "xno" ; then \
- mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \
- ln -sf $(abs_top_builddir)/jvm.cfg \
- openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg ; \
- fi
- if ! test "x$(WITH_CACAO)" = "xno"; then \
- ln -sf $(abs_top_builddir)/ergo.c \
- openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
- fi
-endif
for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
$(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
@@ -924,16 +860,6 @@ endif
touch stamps/ports.stamp
clean-ports:
-if !WITH_ALT_HSBUILD
- for target in $(abs_top_srcdir)/shark/hotspot/make/*/makefiles/* \
- $(abs_top_srcdir)/shark/hotspot/src/*cpu/* \
- $(abs_top_srcdir)/shark/hotspot/src/share/vm/*; do \
- link=$$(dirname $$target | sed 's/^.*shark/openjdk/'); \
- rm -rf $$link; \
- done
- rm -f openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg
- rm -f openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c
-endif
for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
$(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
@@ -964,6 +890,9 @@ stamps/fonts.stamp: stamps/generated.sta
cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.12.properties
mkdir -p stamps
touch stamps/fonts.stamp
+
+clean-fonts:
+ rm -f stamps/fonts.stamp
stamps/patch-fsg.stamp: stamps/fonts.stamp
mkdir -p stamps ; \
diff -r 5772aff6fc53 -r 6246db42e88c acinclude.m4
--- a/acinclude.m4 Thu Nov 11 21:01:13 2010 +0100
+++ b/acinclude.m4 Sun Nov 14 13:53:05 2010 +0000
@@ -917,8 +917,8 @@ AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
[
ORIGINAL_BUILD="original"
- ALTERNATE_BUILD="hs19"
- DEFAULT_BUILD=${ALTERNATE_BUILD}
+ ALTERNATE_BUILD="original"
+ DEFAULT_BUILD=${ORIGINAL_BUILD}
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
[AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use (see hotspot.map))],
diff -r 5772aff6fc53 -r 6246db42e88c hotspot.map
--- a/hotspot.map Thu Nov 11 21:01:13 2010 +0100
+++ b/hotspot.map Sun Nov 14 13:53:05 2010 +0000
@@ -1,3 +1,1 @@
# version url changeset md5sum
-hs19 http://hg.openjdk.java.net/hsx/hsx19/master 13edc857b967 3171888f17698d8e9348f8b3e813d20d
-
diff -r 5772aff6fc53 -r 6246db42e88c patches/alpha-fixes.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
More information about the distro-pkg-dev
mailing list