changeset in /hg/icedtea: Merge Lillian's changes into b26 tree.

[gnu_andrew at member.fsf.org]

changeset e9872d5722d6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e9872d5722d6
description:
	Merge Lillian's changes into b26 tree.

diffstat:

4 files changed, 22 insertions(+), 1 deletion(-)
.hgignore                       |    1 +
ChangeLog                       |   19 +++++++++++++++++++
javac.in                        |    2 +-
patches/icedtea-libraries.patch |    1 +

diffs (62 lines):

diff -r 73a0824be76f -r e9872d5722d6 .hgignore
--- a/.hgignore	Mon May 26 21:49:39 2008 +0100
+++ b/.hgignore	Mon May 26 22:59:09 2008 +0100
@@ -21,6 +21,7 @@ platform_zero
 platform_zero
 jvm.cfg
 ergo.c
+hotspot-tools/
 rt/com/sun/jdi/AbsentInformationException.java
 rt/com/sun/jdi/Accessible.java
 rt/com/sun/jdi/ArrayReference.java
diff -r 73a0824be76f -r e9872d5722d6 ChangeLog
--- a/ChangeLog	Mon May 26 21:49:39 2008 +0100
+++ b/ChangeLog	Mon May 26 22:59:09 2008 +0100
@@ -125,6 +125,25 @@ 2008-05-23  Andrew John Hughes  <gnu_and
 	repositories)
 	* Makefile.in: Regenerated.
 	
+2008-05-22  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Updated conditions to use JAVAC.
+	* Makefile.in: Regenerated.
+
+2008-05-21  Lillian Angel  <langel at redhat.com>
+
+	* generated/sun/awt/X11/generator/sizer.32: Regenerated.
+	* patches/icedtea-libraries.patch: Updated LDLIBS.
+
+2008-05-21  Lillian Angel  <langel at redhat.com>
+
+	* .hgignore: Updated.
+	* Makefile.am: Updated to build with ecj properly.
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+	* javac.in: Changed to use 1.6 source.
+
 2008-05-19  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am: Move build back to using
diff -r 73a0824be76f -r e9872d5722d6 generated/sun/awt/X11/generator/sizer.32
Binary file generated/sun/awt/X11/generator/sizer.32 has changed
diff -r 73a0824be76f -r e9872d5722d6 javac.in
--- a/javac.in	Mon May 26 21:49:39 2008 +0100
+++ b/javac.in	Mon May 26 22:59:09 2008 +0100
@@ -31,4 +31,4 @@ fi
 fi
 
 CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
-  @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
+  @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.6 -nowarn $bcoption $NEW_ARGS
diff -r 73a0824be76f -r e9872d5722d6 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Mon May 26 21:49:39 2008 +0100
+++ b/patches/icedtea-libraries.patch	Mon May 26 22:59:09 2008 +0100
@@ -29,6 +29,7 @@ diff -Nru openjdk.orig/jdk/make/com/sun/
 +            $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
 +            $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
 +            $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
++LDLIBS += -ldl 
 +
 +  OTHER_LDLIBS += -lz
  else