changeset in /hg/icedtea: Merge recent IcedTea6 patches to r903.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Sun Jun 22 12:34:59 PDT 2008
changeset 6a9207d80a39 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6a9207d80a39
description:
Merge recent IcedTea6 patches to r903.
diffstat:
141 files changed, 27989 insertions(+), 25440 deletions(-)
ChangeLog | 102
Makefile.am | 28
Makefile.in | 363
acinclude.m4 | 10
configure | 16
generated/sun/misc/Version.java | 2
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java | 170
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java | 2014 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java | 1067 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java | 488
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizer.java | 130
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java | 97
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt | 37
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java | 206
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java | 798 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java | 607 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java | 238
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSample.java | 195
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java | 103
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java | 139
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java | 2560 ++--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 71
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java | 5456 ++++------
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java | 1501 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidDataException.java | 70
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidFormatException.java | 72
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java | 190
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java | 186
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java | 375
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java | 642 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java | 549 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelChannelMixer.java | 74
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java | 254
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java | 196
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java | 57
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirector.java | 75
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java | 300
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java | 241
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java | 83
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java | 94
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillator.java | 74
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java | 72
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java | 83
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java | 237
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelSource.java | 193
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java | 148
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java | 245
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelTransform.java | 54
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelWavetable.java | 83
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/README.txt | 3
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java | 19
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java | 19
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java | 568 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java | 666 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java | 53
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java | 1687 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java | 71
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java | 135
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java | 69
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java | 175
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Region.java | 316
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java | 403
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java | 1923 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java | 122
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java | 282
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleSoundbank.java | 182
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java | 736 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java | 122
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java | 22
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java | 105
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java | 2949 ++---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java | 336
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java | 650 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftControl.java | 8
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java | 110
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java | 572 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java | 1199 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java | 91
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java | 478
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java | 157
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java | 287
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java | 74
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java | 146
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 184
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java | 1852 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java | 324
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java | 985 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java | 947 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java | 435
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java | 865 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java | 47
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java | 950 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java | 1460 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java | 60
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProcess.java | 14
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java | 29
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java | 88
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResampler.java | 8
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java | 9
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java | 896 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java | 41
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java | 195
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 1898 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java | 443
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java | 1720 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java | 566 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java | 213
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java | 188
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java | 52
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java | 63
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java | 119
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java | 54
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java | 52
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java | 63
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java | 119
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java | 54
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java | 3
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java | 3
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java | 3
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java | 3
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java | 3
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java | 3
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java | 3
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java | 3
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java | 20
patches/icedtea-component.patch | 159
patches/icedtea-copy-plugs.patch | 30
patches/icedtea-core-build.patch | 16
patches/icedtea-dnd-updatecursor.patch | 10
patches/icedtea-ecj.patch | 590 -
patches/icedtea-eclipse-hotspot-6614100-6b06.patch | 56
patches/icedtea-eclipse-hotspot-6614100-7b24.patch | 77
patches/icedtea-gervill.patch | 28
patches/icedtea-jscheme.patch | 1260 ++
patches/icedtea-no-bcopy.patch | 20
patches/icedtea-sparc-ptracefix.patch | 34
patches/icedtea-sparc-trapsfix.patch | 21
patches/icedtea-sparc64-linux.patch | 93
patches/icedtea-zero-build.patch | 75
rt/net/sourceforge/jnlp/Parser.java | 23
rt/net/sourceforge/nanoxml/XMLElement.java | 120
diffs (truncated from 56333 to 500 lines):
diff -r ea9643ca3a31 -r 6a9207d80a39 ChangeLog
--- a/ChangeLog Sun Jun 22 00:45:57 2008 +0100
+++ b/ChangeLog Sun Jun 22 01:28:42 2008 +0100
@@ -1,3 +1,98 @@ 2008-06-02 Andrew John Hughes <gnu_and
+2008-06-20 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-zero-build.patch: Correctly set CPU.
+
+2008-06-20 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-core-build.patch: Defuzz.
+
+2008-06-19 Lillian Angel <langel at redhat.com>
+
+ Fixes Bug #159
+ * patches/icedtea-component.patch: New file.
+ * Makefile.am (ICEDTEA_PATCHES): Add above patch.
+ * Makefile.in: Regenerated.
+
+2008-06-18 Keith Seitz <keiths at redhat.com>
+
+ * patches/icedtea-dnd-updatecursor.patch: New file.
+ * Makefile.am (ICEDTEA_PATCHES): Add above patch.
+ * Makefile.in: Regenerated.
+
+2008-06-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR icedtea/140:
+ * Makefile.am: Add icedtea-jscheme.patch and
+ remove jscheme jar files and scripts after
+ unzipping OpenJDK.
+ * Makefile.in: Regenerated.
+ * patches/icedtea-ecj.patch: Updated for post-jscheme
+ tree.
+ * patches/icedtea-jscheme.patch: Added.
+
+2008-06-11 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
+ like the Sun's verify Java version applet, check for the "_" in the
+ version string. Our version string format is now correct:
+ java version "1.7.0_0"
+ OpenJDK Runtime Environment (build 1.7.0_0-b26)
+ OpenJDK Server VM (build 1.7.0_0-b26, mixed mode)
+ * Makefile.in: Regenerated.
+
+2008-06-10 Lillian Angel <langel at redhat.com>
+
+ * Makefile.in: Regenerated.
+ * aclocal.m4: Likewise.
+ * configure: Likewise.
+ * generated/sun/misc/Version.java: Likewise.
+ * generated/sun/tools/jconsole/Version.java: Likewise.
+
+2008-06-10 Matthias Klose <doko at ubuntu.com>
+
+ * patches/icedtea-no-bcopy.patch: New.
+ * Makefile.am (ICEDTEA_PATCHES): Add patch.
+ * Makefile.in: Regenerate.
+
+2008-06-10 Tom Callaway <tcallawa at redhat.com>
+ Dennis Gilmore <dennis at ausil.us>
+
+ * patches/icedtea-sparc64-linux.patch,
+ patches/icedtea-sparc-ptracefix.patch,
+ patches/icedtea-sparc-trapsfix.patch: New.
+ * Makefile.am (ICEDTEA_PATCHES): Add above patches.
+ * Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
+ symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
+ * acinclude.m4: Set JRE_ARCH_DIR.
+ * Makefile.in, configure: Regenerate.
+
+2008-06-09 Joshua Sumali <jsumali at redhat.com>
+
+ * rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
+ starting the application.
+ * rt/net/sourceforge/nanoxml/XMLElement.java: Be more tolerant to double
+ dashes in xml comments.
+ (sanitizeInput(InputStreamReader, PipedOutputStream)): New method.
+ (expectedInput(String, char)): New method.
+
+2008-06-08 Mark Wielaard <mark at klomp.org>
+
+ * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
+ Import Gervill CVS source reformatting.
+
+2008-06-08 Mark Wielaard <mark at klomp.org>
+
+ * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
+ Import Gervill fixes from CVS. See CHANGES.txt.
+ * overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.
+
+2008-06-08 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (ZERO_PATCHES): Add
+ patches/icedtea-eclipse-hotspot-6614100-7b24.patch.
+ * Makefile.in: Regenerate.
+ * patches/icedtea-eclipse-hotspot-6614100-7b24.patch: New patch.
+
2008-06-02 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Add news stub for next release.
@@ -25,6 +120,13 @@ 2008-05-30 Lillian Angel <langel at redha
* Makefile.am: Fixed dist to not include full path to ports, and
ICEDTEA_ECJ_PATCH. This fixes the problem with "make dist".
* Makefile.in: Regenerated.
+
+2008-06-01 Mark Wielaard <mark at klomp.org>
+
+ * patches/icedtea-copy-plugs.patch: Adjusted to remove sound
+ references in b10.
+ * patches/icedtea-gervill.patch: Adjusted to new sound service
+ files in b10.
2008-05-30 Mark Wielaard <mark at klomp.org>
diff -r ea9643ca3a31 -r 6a9207d80a39 Makefile.am
--- a/Makefile.am Sun Jun 22 00:45:57 2008 +0100
+++ b/Makefile.am Sun Jun 22 01:28:42 2008 +0100
@@ -1,4 +1,6 @@ OPENJDK_VERSION = b26
OPENJDK_VERSION = b26
+
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
if NETX_PLUGIN
NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -60,6 +62,7 @@ ICEDTEA_BOOT_DIR= \
$(abs_top_builddir)/bootstrap/jdk1.6.0
ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
if CORE_BUILD
ICEDTEA_CORE_BUILD = yes
else
@@ -74,8 +77,9 @@ ICEDTEA_ENV = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
"BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+ "JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -132,8 +136,9 @@ ICEDTEA_ENV_ECJ = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
"BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+ "JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -339,8 +344,16 @@ ICEDTEA_PATCHES = \
patches/icedtea-directaudio-close-trick.patch \
patches/icedtea-hat-spl-gpl.patch \
patches/icedtea-sparc.patch \
+ patches/icedtea-sparc64-linux.patch \
+ patches/icedtea-sparc-ptracefix.patch \
+ patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
$(ZERO_PATCHES_COND) \
+ patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
+ patches/icedtea-no-bcopy.patch \
+ patches/icedtea-jscheme.patch \
+ patches/icedtea-dnd-updatecursor.patch \
+ patches/icedtea-component.patch \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES) \
patches/icedtea-xslfix.patch \
@@ -548,8 +561,13 @@ stamps/bootstrap-directory-ecj.stamp:
if test -d $(SYSTEM_GCJ_DIR); \
then \
mkdir -p bootstrap/ecj/jre/lib; \
- ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+ ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
bootstrap/ecj/jre/lib/; \
+ if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+ then \
+ ln -sf ./$(JRE_ARCH_DIR) \
+ bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+ fi; \
mkdir -p bootstrap/ecj/include; \
for i in $(SYSTEM_GCJ_DIR)/include/*; do \
test -r $$i | continue; \
diff -r ea9643ca3a31 -r 6a9207d80a39 Makefile.in
--- a/Makefile.in Sun Jun 22 00:45:57 2008 +0100
+++ b/Makefile.in Sun Jun 22 01:28:42 2008 +0100
@@ -138,6 +138,7 @@ JAVA = @JAVA@
JAVA = @JAVA@
JAVAC = @JAVAC@
JAVAH = @JAVAH@
+JRE_ARCH_DIR = @JRE_ARCH_DIR@
LDFLAGS = @LDFLAGS@
LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
LIBFFI_LIBS = @LIBFFI_LIBS@
@@ -250,7 +251,18 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
OPENJDK_VERSION = b26
+||||||| /tmp/Makefile.in~base.9SzsA6
+OPENJDK_DATE = 11_apr_2008
+OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
+OPENJDK_VERSION = b09
+=======
+OPENJDK_DATE = 30_may_2008
+OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_VERSION = b10
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
@NETX_PLUGIN_FALSE at NETX_PATCH =
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -269,31 +281,63 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+=======
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_RT = \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+=======
$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_CLS_DIR = \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+=======
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_BOOT_DIR = \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ $(abs_top_srcdir)/bootstrap/jdk1.6.0
+=======
$(abs_top_builddir)/bootstrap/jdk1.6.0
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
@CORE_BUILD_FALSE at ICEDTEA_CORE_BUILD =
@CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
@ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD =
@ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
"JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+||||||| /tmp/Makefile.in~base.9SzsA6
+ "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
+ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+=======
+ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+=======
"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -311,23 +355,54 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
+=======
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
$(am__append_2) $(am__append_3)
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/
+||||||| /tmp/Makefile.in~base.9SzsA6
+ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+=======
+ $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_CLS_DIR_ECJ = \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/classes
+||||||| /tmp/Makefile.in~base.9SzsA6
+ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+=======
+ $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
"JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+||||||| /tmp/Makefile.in~base.9SzsA6
+ "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
+ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+=======
+ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+=======
"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
@@ -351,15 +426,27 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
+=======
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
$(am__append_5) $(am__append_6)
# OpenJDK Source Preparation Targets
# ==================================
# Download OpenJDK sources.
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
@USE_ALT_OPENJDK_SRC_ZIP_FALSE at OPENJDK_SRC_ZIP =
+||||||| /tmp/Makefile.in~base.9SzsA6
+OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+=======
+OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
@USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
@GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
@@ -381,9 +468,15 @@ ZERO_PATCHES = \
patches/icedtea-signed-types.patch \
patches/icedtea-test-atomic-operations.patch \
patches/icedtea-zero.patch \
- patches/icedtea-ia64-bugfix.patch
-
- at ZERO_BUILD_FALSE@ZERO_PATCHES_COND =
+ patches/icedtea-ia64-bugfix.patch \
+ patches/icedtea-eclipse-hotspot-6614100-7b24.patch
+
+
+# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
+NON_ZERO_PATCHES = \
+ patches/icedtea-eclipse-hotspot-6614100-6b06.patch
+
+ at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
@ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
patches/icedtea-version.patch \
@@ -412,21 +505,40 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
- patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
+ patches/icedtea-arm-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-LCMS-setTagData.patch \
patches/icedtea-color-createcontext.patch \
- patches/icedtea-color-profiles.patch \
patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
patches/icedtea-override-redirect-metacity.patch \
$(ZERO_PATCHES_COND) $(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
patches/icedtea-xslfix.patch patches/icedtea-override.patch \
$(am__append_7)
+||||||| /tmp/Makefile.in~base.9SzsA6
+ patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
+ patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
+ $(DISTRIBUTION_PATCHES) $(am__append_7)
+=======
+ patches/icedtea-sparc.patch \
+ patches/icedtea-sparc64-linux.patch \
+ patches/icedtea-sparc-ptracefix.patch \
+ patches/icedtea-sparc-trapsfix.patch \
+ patches/icedtea-override-redirect-metacity.patch \
+ patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
+ patches/icedtea-dnd-updatecursor.patch \
+ patches/icedtea-component.patch $(GCC_PATCH) \
+ $(DISTRIBUTION_PATCHES) $(am__append_7)
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
# Patch OpenJDK for plug replacements and ecj.
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+=======
ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
@WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
@WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP =
@WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP =
@@ -842,24 +954,84 @@ clean-clone:
rm -rf openjdk
# Link ports sources into tree
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
stamps/ports.stamp: stamps/clone.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
ln -sf $$target $$link; \
+||||||| /tmp/Makefile.in~base.9SzsA6
+stamps/ports.stamp: stamps/extract.stamp
+ for target in ports/hotspot/build/*/makefiles/* \
+ ports/hotspot/src/*/*; do \
+ link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
+ ln -sf $$PWD/$$target $$link; \
+=======
+stamps/ports.stamp: stamps/extract.stamp
+ for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+ link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+ ln -sf $$target $$link; \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
done
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+=======
ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+=======
ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+=======
ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
mkdir -p stamps
touch stamps/ports.stamp
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
stamps/patch.stamp: stamps/clone.stamp
+||||||| /tmp/Makefile.in~base.9SzsA6
+stamps/extract.stamp: stamps/download.stamp
+ if ! test -d openjdk ; \
+ then \
+ mkdir openjdk ; \
+ $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
+ chmod -R ug+w openjdk ; \
+ fi
+ mkdir -p stamps
+ touch stamps/extract.stamp
+
+clean-extract:
+ rm -f stamps/extract.stamp
+
+stamps/patch.stamp: stamps/extract.stamp
+=======
+stamps/extract.stamp: stamps/download.stamp
+ if ! test -d openjdk ; \
+ then \
+ mkdir openjdk ; \
+ $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
+ chmod -R ug+w openjdk ; \
More information about the distro-pkg-dev
mailing list