Mercurial > hg > release > icedtea6-1.8

changeset 1836:32f70f3018be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 21 Jan 2010 02:07:48 +0000
parents 423b82ca768c (current diff) daf81eeba901 (diff)
children 2d94f16209e8
files ChangeLog Makefile.am
diffstat 2 files changed, 25 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 21 01:57:01 2010 +0000
+++ b/ChangeLog	Thu Jan 21 02:07:48 2010 +0000
@@ -1,20 +1,3 @@
-2010-01-08  Andrew John Hughes  <ahughes@redhat.com>
-
-	* Makefile.am:
-	Calculate JDK and HotSpot Mercurial revisions
-	if available and pass to build.  Also pass
-	DIST_NAME to build.
-	* acinclude.m4:
-	(IT_GET_LSB_DATA): Moved from configure.ac
-	and extended to also obtain the name of
-	the distribution from either lsb_release -is
-	or $build_os.
-	* configure.ac:
-	Invoke IT_GET_LSB_DATA macro.
-	* patches/icedtea-version.patch:
-	Updated to use distribution name and JDK and
-	HotSpot Mercurial revision IDs.
-
 2010-01-20  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
@@ -33,6 +16,30 @@
 	Updated to include DERIVATIVE_ID (IcedTea6 version)
 	in the crash dump output.
 
+2010-01-20  Xerxes Rånby  <xerxes@zafena.se>
+
+	PR icedtea/431:
+	* Makefile.am:
+	Create a link from client to server after CACAO install
+	to make openjdk find the expected client dir on 32bit systems.
+
+2010-01-08  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Calculate JDK and HotSpot Mercurial revisions
+	if available and pass to build.  Also pass
+	DIST_NAME to build.
+	* acinclude.m4:
+	(IT_GET_LSB_DATA): Moved from configure.ac
+	and extended to also obtain the name of
+	the distribution from either lsb_release -is
+	or $build_os.
+	* configure.ac:
+	Invoke IT_GET_LSB_DATA macro.
+	* patches/icedtea-version.patch:
+	Updated to use distribution name and JDK and
+	HotSpot Mercurial revision IDs.
+
 2010-01-19 Man Lung Wong  <mwong@redhat.com>
 
 	* rt/net/sourceforge/jnlp/JNLPFile.java
--- a/Makefile.am	Thu Jan 21 01:57:01 2010 +0000
+++ b/Makefile.am	Thu Jan 21 02:07:48 2010 +0000
@@ -1754,6 +1754,7 @@
 	  --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \
 	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
 	$(ARCH_PREFIX) $(MAKE) install
+	ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
 endif
 endif
 	mkdir -p stamps