/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset ee15ca8cf99e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ee15ca8cf99e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 08 15:15:43 2010 +0000

	Revert previous change to copying over linking; patch will break
	hard links.

	2010-03-08 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (stamps/extract-ecj.stamp): Revert
	previous change to copying. Patch will break hard links.


changeset 9c3d0d30552c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9c3d0d30552c
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 08 15:18:20 2010 +0000

	Merge


diffstat:

2 files changed, 13 insertions(+), 1 deletion(-)
ChangeLog   |   10 ++++++++++
Makefile.am |    4 +++-

diffs (38 lines):

diff -r 7d4276d04ffc -r 9c3d0d30552c ChangeLog
--- a/ChangeLog	Mon Mar 08 13:52:05 2010 +0000
+++ b/ChangeLog	Mon Mar 08 15:18:20 2010 +0000
@@ -1,3 +1,13 @@ 2010-03-08  Andrew John Hughes  <ahughes
+2010-03-08  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(stamps/extract-ecj.stamp): Revert previous change
+	to copying.  Patch will break hard links.
+
+2010-03-08  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (ICEDTEA_ECJ_PATCHES): Add DISTRIBUTION_ECJ_PATCHES.
+
 2010-03-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 7d4276d04ffc -r 9c3d0d30552c Makefile.am
--- a/Makefile.am	Mon Mar 08 13:52:05 2010 +0000
+++ b/Makefile.am	Mon Mar 08 15:18:20 2010 +0000
@@ -390,6 +390,8 @@ ICEDTEA_ECJ_PATCHES += \
 ICEDTEA_ECJ_PATCHES += \
 	patches/ecj/icedtea-jaxws-getdtdtype.patch
 endif
+
+ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES)
 
 # OpenJDK build environment.
 if ZERO_BUILD
@@ -1164,7 +1166,7 @@ endif
 # FIXME (missing): Rename to clone-ecj.
 stamps/extract-ecj.stamp: $(OPENJDK_TREE)
 	if ! test -d openjdk-ecj ; then \
-	    cp -a openjdk openjdk-ecj ; \
+	    cp -pPRl openjdk openjdk-ecj ; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract-ecj.stamp