/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sun Apr 18 09:04:23 PDT 2010
changeset e89067b8a611 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e89067b8a611
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Apr 18 17:03:04 2010 +0100
Log all output from configure command invocations to config.log.
2010-04-18 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (FIND_JAR): Log all output to
config.log (AC_CHECK_WITH_HG_REVISION): Likewise.
(IT_CHECK_PLUGIN_DEPENDENCIES): Likewise.
changeset 3e9397f2ac2c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3e9397f2ac2c
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Apr 18 17:04:10 2010 +0100
Merge
diffstat:
70 files changed, 1258 insertions(+), 14062 deletions(-)
ChangeLog | 176
Makefile.am | 77
acinclude.m4 | 11
hotspot.map | 3
patches/ecj/override.patch | 11
patches/hotspot/hs16/6873059-javac-versioning-hotspot.patch | 245
patches/hotspot/hs16/icedtea-params-cast-size_t.patch | 252
patches/hotspot/hs16/memory-limits.patch | 24
patches/hotspot/hs16/openjdk-6886353-ignore_deoptimizealot.patch | 33
patches/hotspot/hs16/shark.patch | 9
patches/hotspot/hs16/zero.patch | 107
patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch | 42
patches/hotspot/hs17/params-cast-size_t.patch | 252
patches/hotspot/hs17/systemtap.patch | 157
patches/hotspot/original/6873059-javac-versioning-hotspot.patch | 245
patches/hotspot/original/icedtea-6778657-f2i-overflow.patch | 96
patches/hotspot/original/icedtea-6778662-lib64.patch | 16
patches/hotspot/original/icedtea-6791168.patch | 230
patches/hotspot/original/icedtea-6793825-includedb.patch | 107
patches/hotspot/original/icedtea-debuginfo.patch | 15
patches/hotspot/original/icedtea-params-cast-size_t.patch | 255
patches/hotspot/original/memory-limits.patch | 23
patches/hotspot/original/params-cast-size_t.patch | 252
patches/hotspot/original/systemtap.patch | 182
patches/icedtea-6761856-freetypescaler.patch | 47
patches/icedtea-explicit-target-arch.patch | 6
patches/icedtea-fonts.patch | 783 -
patches/icedtea-lcms.patch | 18
patches/icedtea-nss-6763530.patch | 55
patches/icedtea-systemtap.patch | 182
patches/memory-limits.patch | 24
patches/openjdk/6822370-reentrantreadwritelock.patch | 65
patches/openjdk/6873059-javac-versioning-corba.patch | 23
patches/openjdk/6873059-javac-versioning-jdk.patch | 15
patches/openjdk/6879689-hotspot_warning_fix.patch | 22
patches/openjdk/6896472-missing_libjsig.patch | 20
patches/openjdk/6928623-verbose-langtools.patch | 22
patches/openjdk/annotation-tests.patch | 5867 ----------
patches/openjdk/bidi-tests.patch | 295
patches/security/20100330/6633872.patch | 443
patches/security/20100330/6639665.patch | 51
patches/security/20100330/6736390.patch | 18
patches/security/20100330/6745393.patch | 1233 --
patches/security/20100330/6887703.patch | 28
patches/security/20100330/6888149.patch | 33
patches/security/20100330/6892265.patch | 35
patches/security/20100330/6893947.patch | 86
patches/security/20100330/6893954.patch | 248
patches/security/20100330/6894807.patch | 27
patches/security/20100330/6898622.patch | 20
patches/security/20100330/6898739.patch | 437
patches/security/20100330/6899653.patch | 27
patches/security/20100330/6902299.patch | 104
patches/security/20100330/6904691.patch | 166
patches/security/20100330/6909597.patch | 74
patches/security/20100330/6910590.patch | 10
patches/security/20100330/6914823.patch | 80
patches/security/20100330/6914866.patch | 118
patches/security/20100330/6932480.patch | 43
patches/security/20100330/hotspot/hs16/6626217.patch | 160
patches/shark.patch | 9
patches/zero.patch | 107
patches/zero/6890308.patch | 760 -
patches/zero/6891677.patch | 418
patches/zero/6896043.patch | 113
patches/zero/6903453.patch | 38
patches/zero/6909153.patch | 40
patches/zero/6913869.patch | 12
patches/zero/6914622.patch | 98
patches/zero/6939845.patch | 20
diffs (truncated from 15829 to 500 lines):
diff -r e26a587c0236 -r 3e9397f2ac2c ChangeLog
--- a/ChangeLog Mon Apr 12 22:27:59 2010 +0100
+++ b/ChangeLog Sun Apr 18 17:04:10 2010 +0100
@@ -1,3 +1,14 @@ 2010-04-12 Andrew John Hughes <ahughes
+2010-04-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (FIND_JAR): Log all output to config.log
+ (AC_CHECK_WITH_HG_REVISION): Likewise.
+ (IT_CHECK_PLUGIN_DEPENDENCIES): Likewise.
+
+2010-04-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Bump to b19 tarball.
+
2010-04-12 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/373
@@ -57,6 +68,38 @@ 2010-04-12 Matthias Klose <doko at ubuntu
* configure.ac: Clarify result message of the NSS check.
+2010-04-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/original/6873059-javac-versioning-hotspot.patch,
+ * patches/openjdk/6873059-javac-versioning-corba.patch,
+ * patches/openjdk/6873059-javac-versioning-jdk.patch:
+ Removed, upstreamed.
+ * Makefile.am:
+ Move 6873059 to hs17-specific block.
+
+2010-04-11 Andrew John Hughes <ahughes at redhat.com>
+
+ Support hs17.
+ * patches/icedtea-params-cast-size_t.patch,
+ * patches/icedtea-systemtap.patch:
+ Split into original and hs17 versions.
+ * Makefile.am:
+ Make above patches $(HSBUILD) specific.
+ Add 6896472 fix for hs17.
+ * hotspot.map: Add hs17 b13, enabled using
+ --with-hotspot-build=hs17.
+ * patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch,
+ * patches/hotspot/hs17/params-cast-size_t.patch,
+ * patches/hotspot/hs17/systemtap.patch:
+ New variants for hs17.
+ * patches/hotspot/original/params-cast-size_t.patch,
+ * patches/hotspot/original/systemtap.patch:
+ Moved from main patches directory.
+ * patches/icedtea-explicit-target-arch.patch:
+ Remove unneeded diff at top which breaks on hs17.
+ * patches/openjdk/6896472-missing_libjsig.patch:
+ Backport from OpenJDK7; needed for hs17.
+
2010-04-10 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ICEDTEA_PATCHES): Always apply
@@ -66,6 +109,12 @@ 2010-04-10 Matthias Klose <doko at ubuntu
is enabled or disabled by default.
* patches/icedtea-nss-not-enabled-config.patch: New.
+2010-04-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/zero/6939845.patch,
+ * Makefile.am:
+ Remove upstreamed Zero patch.
+
2010-04-09 Xerxes RÃ¥nby <xerxes at zafena.se>
* Makefile.am (ICEDTEA_PATCHES):
@@ -75,6 +124,15 @@ 2010-04-09 Xerxes RÃ¥nby <xerxes at zafen
* patches/zero/6939845.patch: added from upstream.
* patches/zero/cppInterpreter-fast-bytecodes.patch: removed.
+2010-04-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/zero/6903453.patch,
+ * patches/zero/6909153.patch,
+ * patches/zero/6913869.patch,
+ * patches/zero/6914622.patch,
+ * Makefile.am:
+ Remove patches applied upstream.
+
2010-04-08 Andrew John Hughes <ahughes at redhat.com>
* configure.ac: Move NSS detection to macros
@@ -97,6 +155,13 @@ 2010-04-08 Andrew John Hughes <ahughes
* Makefile.am: Remove remaining references to
rt source directory.
+
+2010-04-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6879689-hotspot_warning_fix.patch,
+ * patches/security/20100330/6633872.patch,
+ * Makefile.am:
+ Remove upstreamed patches.
2010-04-07 Deepak Bhole <dbhole at redhat.com>
@@ -154,6 +219,41 @@ 2010-04-06 Deepak Bhole <dbhole at redhat.
(IcedTeaScriptableJavaObject::deAllocate): Same.
(IcedTeaScriptableJavaObject::invalidate): Same.
+2010-04-06 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/hs16/6873059-javac-versioning-hotspot.patch:
+ Moved to hotspot/original.
+ * patches/openjdk/6822370-reentrantreadwritelock.patch,
+ * patches/security/20100330/6639665.patch,
+ * patches/security/20100330/6736390.patch,
+ * patches/security/20100330/6745393.patch,
+ * patches/security/20100330/6887703.patch,
+ * patches/security/20100330/6888149.patch,
+ * patches/security/20100330/6892265.patch,
+ * patches/security/20100330/6893947.patch,
+ * patches/security/20100330/6893954.patch,
+ * patches/security/20100330/6894807.patch,
+ * patches/security/20100330/6898622.patch,
+ * patches/security/20100330/6898739.patch,
+ * patches/security/20100330/6899653.patch,
+ * patches/security/20100330/6902299.patch,
+ * patches/security/20100330/6904691.patch,
+ * patches/security/20100330/6909597.patch,
+ * patches/security/20100330/6910590.patch,
+ * patches/security/20100330/6914823.patch,
+ * patches/security/20100330/6914866.patch,
+ * patches/security/20100330/6932480.patch,
+ * patches/security/20100330/hotspot/hs16/6626217.patch:
+ Drop patches available upstream.
+ * Makefile.am: Remove listed patches.
+ * patches/hotspot/original/6873059-javac-versioning-hotspot.patch:
+ Moved from hs16 directory.
+ * patches/icedtea-lcms.patch:
+ Recreated against new security patches (inverse of
+ before where 6899653 was adapted to our LCMS fix).
+ * patches/security/20100330/6633872.patch:
+ Keep just the fragment not in the Sun version which
+ fixes an NPE when running rmid.
2010-04-04 Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
@@ -222,6 +322,11 @@ 2009-03-30 Andrew John Hughes <ahughes
2010-03-30 Andrew John Hughes <ahughes at redhat.com>
+ * patches/icedtea-override.patch:
+ Fix path on previous HttpsClient hunk.
+
+2010-03-30 Andrew John Hughes <ahughes at redhat.com>
+
* patches/openjdk/6873059-javac-versioning-hotspot.patch:
Move to hotspot/original directory.
* Makefile.am: Make javac versioning patch for HotSpot
@@ -236,6 +341,18 @@ 2010-03-30 Edward Nevill <ed at camswl.c
* bytecodeInterpreter.cpp
Fix to support fast bytecodes
+
+2010-03-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/annotation-tests.patch:
+ Dropped, was applied upstream in a different
+ directory some time ago.
+ * patches/openjdk/bidi-tests.patch,
+ * patches/zero/6890308.patch,
+ * patches/zero/6891677.patch,
+ * patches/zero/6896043.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Remove above.
2010-03-29 Andrew John Hughes <ahughes at redhat.com>
@@ -280,6 +397,12 @@ 2010-03-29 Andrew John Hughes <ahughes
* THANKYOU: Add C. K. Jester-Young who created
the initial Perl version of javac.in.
+2010-03-28 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-override.patch:
+ Remove @Override on interface method
+ in sun/net/www/protocol/https/HttpsClient.java
+
2009-08-21 Andrew John Hughes <ahughes at redhat.com>
* javac.in:
@@ -538,7 +661,6 @@ 2010-03-16 Andrew John Hughes <ahughes
Fix references to IcedTeaNPPlugin.h.
2010-03-16 Andrew John Hughes <ahughes at redhat.com>
-
* patches/icedtea-override.patch:
Moved to ecj subdirectory.
* Makefile.am:
@@ -701,6 +823,13 @@ 2010-03-13 Deepak Bhole <dbhole at redhat.
* plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
(startProcessing): Call consumer.queue() instead of consumer.consume().
(postMessage): Remove unused method.
+
+2010-03-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-fonts.patch:
+ Removed, applied upstream as S6934327.
+ http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/178f954e1fd1
+ * Makefile.am: Drop above patch.
2010-03-12 Andrew John Hughes <ahughes at redhat.com>
@@ -1179,6 +1308,12 @@ 2010-03-04 Xerxes RÃ¥nby <xerxes at zafen
(sharkCompiler::sharkCompiler): Move mattr define to make its memory
valid in the scope where it are used by the args vector.
+2010-03-02 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6928623-verbose-langtools.patch:
+ Removed, applied upstream.
+ * Makefile.am: Drop above patch.
+
2010-03-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
@@ -1299,6 +1434,34 @@ 2010-02-26 Xerxes RÃ¥nby <xerxes at zafen
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
(SharkCompiler::generate_native_code): Undefine debug code for
NDEBUG builds
+
+2010-02-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/hs16/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/hs16/memory-limits.patch:
+ Move to main patches directory.
+ * patches/hotspot/hs16/openjdk-6886353-ignore_deoptimizealot.patch:
+ Dropped, applied upstream.
+ * patches/hotspot/hs16/shark.patch,
+ * patches/hotspot/hs16/zero.patch:
+ Moved to main patches directory.
+ * patches/hotspot/original/icedtea-6778657-f2i-overflow.patch,
+ * patches/hotspot/original/icedtea-6778662-lib64.patch,
+ * patches/hotspot/original/icedtea-6791168.patch,
+ * patches/hotspot/original/icedtea-6793825-includedb.patch,
+ * patches/hotspot/original/icedtea-debuginfo.patch,
+ * patches/hotspot/original/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/original/memory-limits.patch:
+ Obsoleted by move to hs16 upstream.
+ * patches/icedtea-nss-6763530.patch:
+ Applied upstream.
+ * Makefile.am: Update patch list.
+ * hotspot.map: Remove outdated hs16 build.
+ * patches/icedtea-params-cast-size_t.patch,
+ * patches/memory-limits.patch,
+ * patches/shark.patch,
+ * patches/zero.patch:
+ Moved from hotspot/hs16.
2010-02-24 Andrew John Hughes <ahughes at redhat.com>
@@ -1581,9 +1744,20 @@ 2010-02-17 Andrew John Hughes <ahughes@
2010-02-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
+ Update JAXP tarball.
+
+2010-02-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
Remove dead JAXWS and JAXP sourcepaths.
Add sun.misc.Unsafe explicitly to ensure
it is compiled as a bootstrap class.
+
+2010-02-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-6761856-freetypescaler.patch:
+ Dropped; applied upstream.
+ * Makefile.am: Remove above patch.
2010-02-17 Andrew John Hughes <ahughes at redhat.com>
diff -r e26a587c0236 -r 3e9397f2ac2c Makefile.am
--- a/Makefile.am Mon Apr 12 22:27:59 2010 +0100
+++ b/Makefile.am Sun Apr 18 17:04:10 2010 +0100
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 16_feb_2010
-OPENJDK_MD5SUM = 94db01691ab38f98b7d42b2ebf4d5c0b
-OPENJDK_VERSION = b18
+OPENJDK_DATE = 15_apr_2010
+OPENJDK_MD5SUM = 39bbf623a6c83ca63b92593062a28146
+OPENJDK_VERSION = b19
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = 0.99.4
@@ -23,9 +23,9 @@ JAXWS_DROP_SHA256SUM = 155ff3be83c980e19
JAXWS_DROP_SHA256SUM = 155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2
JAF_DROP_ZIP = jdk6-jaf-2009_10_27.zip
JAF_DROP_SHA256SUM = fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147329
-JAXP_DROP_ZIP = jdk6-jaxp-2009_10_13.zip
-JAXP_DROP_SHA256SUM = 8714d55de18db48ca9da0ee986202005082f44cf4c215da8683342b70e61792b
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147491
+JAXP_DROP_ZIP = jdk6-jaxp-2010_01_15.zip
+JAXP_DROP_SHA256SUM = 181615cfec1c3721a7d8f278fa25b392be4247a496c7774a10cb9df37684f94f
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
@@ -224,14 +224,6 @@ ICEDTEA_FSG_PATCHES =
ICEDTEA_FSG_PATCHES =
ICEDTEA_PATCHES = \
- patches/zero/6890308.patch \
- patches/zero/6891677.patch \
- patches/zero/6896043.patch \
- patches/zero/6903453.patch \
- patches/zero/6909153.patch \
- patches/zero/6913869.patch \
- patches/zero/6914622.patch \
- patches/zero/6939845.patch \
patches/zero/shark_do_nothing_on_stub_frame.patch \
patches/icedtea-notice-safepoints.patch \
patches/icedtea-parisc-opt.patch \
@@ -248,7 +240,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-gcc-suffix.patch \
patches/icedtea-gcc-suffix-hotspot.patch \
patches/icedtea-bytebuffer-compact.patch \
- patches/hotspot/$(HSBUILD)/memory-limits.patch \
+ patches/memory-limits.patch \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
@@ -259,7 +251,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
patches/icedtea-freetypeversion.patch \
- patches/icedtea-fonts.patch \
patches/icedtea-shark-build.patch \
patches/icedtea-shark-build-hotspot.patch \
patches/icedtea-nomotif-6706121.patch \
@@ -269,7 +260,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-alt-jar.patch \
patches/icedtea-jdk-use-ssize_t.patch \
patches/icedtea-use-idx_t.patch \
- patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \
+ patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \
patches/icedtea-clean-crypto.patch \
patches/icedtea-shark.patch \
patches/icedtea-arch.patch \
@@ -278,13 +269,10 @@ ICEDTEA_PATCHES = \
patches/icedtea-renderer-crossing.patch \
patches/icedtea-stroker-finish.patch \
patches/icedtea-linker-libs-order.patch \
- patches/icedtea-6761856-freetypescaler.patch \
patches/icedtea-testenv.patch \
patches/icedtea-samejvm-safe.patch \
patches/icedtea-pr261.patch \
patches/icedtea-doc-headers.patch \
- patches/openjdk/bidi-tests.patch \
- patches/openjdk/annotation-tests.patch \
patches/icedtea-sparc-buildfixes.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
@@ -303,43 +291,24 @@ ICEDTEA_PATCHES = \
patches/icedtea-disable-cc-incompatible-sanity-checks.patch \
patches/icedtea-explicit-target-arch.patch \
patches/icedtea-gcc-stack-markings.patch \
- patches/openjdk/6879689-hotspot_warning_fix.patch \
- patches/openjdk/6928623-verbose-langtools.patch \
patches/icedtea-no-precompiled.patch \
patches/icedtea-linux-separate-debuginfo.patch \
patches/icedtea-parisc.patch \
patches/icedtea-sh4-support.patch \
patches/libpng.patch \
+ patches/zero.patch \
+ patches/shark.patch \
patches/extensions/netx.patch \
patches/extensions/netx-dist.patch \
patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
- patches/openjdk/6873059-javac-versioning-corba.patch \
- patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch \
- patches/openjdk/6873059-javac-versioning-jdk.patch \
- patches/security/20100330/hotspot/$(HSBUILD)/6626217.patch \
- patches/security/20100330/6633872.patch \
- patches/security/20100330/6639665.patch \
- patches/security/20100330/6736390.patch \
- patches/security/20100330/6745393.patch \
- patches/security/20100330/6887703.patch \
- patches/security/20100330/6888149.patch \
- patches/security/20100330/6892265.patch \
- patches/security/20100330/6893947.patch \
- patches/security/20100330/6893954.patch \
- patches/security/20100330/6894807.patch \
- patches/security/20100330/6898622.patch \
- patches/security/20100330/6898739.patch \
- patches/security/20100330/6899653.patch \
- patches/security/20100330/6902299.patch \
- patches/security/20100330/6904691.patch \
- patches/security/20100330/6909597.patch \
- patches/security/20100330/6910590.patch \
- patches/security/20100330/6914823.patch \
- patches/security/20100330/6914866.patch \
- patches/security/20100330/6932480.patch \
- patches/icedtea-nss-6763530.patch \
patches/nss-debug.patch
+
+if WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += \
+ patches/openjdk/6896472-missing_libjsig.patch \
+ patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch
+endif
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -387,25 +356,13 @@ endif
endif
if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
+ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/systemtap.patch
endif
if ENABLE_NSS
ICEDTEA_PATCHES += patches/icedtea-nss-config.patch
else
ICEDTEA_PATCHES += patches/icedtea-nss-not-enabled-config.patch
-endif
-
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
- patches/hotspot/$(HSBUILD)/zero.patch \
- patches/hotspot/$(HSBUILD)/shark.patch
-else
-ICEDTEA_PATCHES += patches/hotspot/original/icedtea-6778662-lib64.patch \
- patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
- patches/hotspot/original/icedtea-6791168.patch \
- patches/hotspot/original/icedtea-6793825-includedb.patch \
- patches/openjdk/6822370-reentrantreadwritelock.patch
endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
diff -r e26a587c0236 -r 3e9397f2ac2c acinclude.m4
--- a/acinclude.m4 Mon Apr 12 22:27:59 2010 +0100
+++ b/acinclude.m4 Sun Apr 18 17:04:10 2010 +0100
@@ -379,7 +379,7 @@ AC_DEFUN([FIND_JAR],
cat >_config.list <<EOF
_config.txt
EOF
- if $JAR cf _config.jar @_config.list 2>&AS_MESSAGE_LOG_FD; then
+ if $JAR cf _config.jar @_config.list >&AS_MESSAGE_LOG_FD 2>&1; then
JAR_KNOWS_ATFILE=1
AC_MSG_RESULT(yes)
else
@@ -387,7 +387,7 @@ EOF
AC_MSG_RESULT(no)
fi
AC_MSG_CHECKING([whether jar supports stdin file arguments])
- if cat _config.list | $JAR cf@ _config.jar 2>&AS_MESSAGE_LOG_FD; then
+ if cat _config.list | $JAR cf@ _config.jar >&AS_MESSAGE_LOG_FD 2>&1; then
JAR_ACCEPTS_STDIN_LIST=1
AC_MSG_RESULT(yes)
else
@@ -396,7 +396,7 @@ EOF
fi
rm -f _config.list _config.jar
AC_MSG_CHECKING([whether jar supports -J options at the end])
- if $JAR cf _config.jar _config.txt -J-Xmx896m 2>&AS_MESSAGE_LOG_FD; then
+ if $JAR cf _config.jar _config.txt -J-Xmx896m >&AS_MESSAGE_LOG_FD 2>&1; then
JAR_KNOWS_J_OPTIONS=1
AC_MSG_RESULT(yes)
else
@@ -1414,7 +1414,7 @@ AC_DEFUN_ONCE([IT_OBTAIN_HG_REVISIONS],
ICEDTEA_REVISION="none";
JDK_REVISION="none";
HOTSPOT_REVISION="none";
- if which ${HG} >/dev/null; then
+ if which ${HG} >&AS_MESSAGE_LOG_FD 2>&1; then
AC_MSG_CHECKING([for IcedTea Mercurial revision ID])
if test -e ${abs_top_srcdir}/.hg ; then
ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} tip --template '{node|short}')`" ;
@@ -1462,8 +1462,7 @@ if test "x${enable_plugin}" = "xyes" ; t
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-
- if $PKG_CONFIG --atleast-version 1.9.2 libxul 2>&AS_MESSAGE_LOG_FD ; then
+ if $PKG_CONFIG --atleast-version 1.9.2 libxul >&AS_MESSAGE_LOG_FD 2>&1; then
xullibs=libxul
else
xullibs="libxul libxul-unstable"
diff -r e26a587c0236 -r 3e9397f2ac2c hotspot.map
--- a/hotspot.map Mon Apr 12 22:27:59 2010 +0100
+++ b/hotspot.map Sun Apr 18 17:04:10 2010 +0100
@@ -1,2 +1,3 @@
# version url changeset md5sum
-hs16 http://hg.openjdk.java.net/hsx/hsx16/master 62926c7f67a3 d683eb501e7ce710198f20f0c127ebbb
+hs17 http://hg.openjdk.java.net/hsx/hsx17/master 8ca546927f8c 0d41815127b8fecd0a4e1546e23fa1f3
+
diff -r e26a587c0236 -r 3e9397f2ac2c patches/ecj/override.patch
--- a/patches/ecj/override.patch Mon Apr 12 22:27:59 2010 +0100
+++ b/patches/ecj/override.patch Sun Apr 18 17:04:10 2010 +0100
@@ -196,3 +196,14 @@ diff -Nru openjdk.orig/jdk/src/share/cla
More information about the distro-pkg-dev
mailing list