/hg/icedtea6: Don't overwrite the hs23 ARM port with the one in-...

[andrew at icedtea.classpath.org]

changeset df51aa5a4270 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=df51aa5a4270
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jul 23 00:18:28 2013 +0100

	Don't overwrite the hs23 ARM port with the one in-tree.

	2013-07-22  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ports): Only copy over arm_port directory
		contents if using the upstream HotSpot 20.
		(clean-ports): Likewise for cleanup.


diffstat:

 ChangeLog   |  7 +++++++
 Makefile.am |  4 ++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diffs (43 lines):

diff -r f9036c0f3155 -r df51aa5a4270 ChangeLog
--- a/ChangeLog	Mon Jul 22 23:59:29 2013 +0100
+++ b/ChangeLog	Tue Jul 23 00:18:28 2013 +0100
@@ -1,3 +1,10 @@
+2013-07-22  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ports): Only copy over arm_port directory
+	contents if using the upstream HotSpot 20.
+	(clean-ports): Likewise for cleanup.
+
 2013-07-22  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	PR718: Backport LCMS2 support from IcedTea7
diff -r f9036c0f3155 -r df51aa5a4270 Makefile.am
--- a/Makefile.am	Mon Jul 22 23:59:29 2013 +0100
+++ b/Makefile.am	Tue Jul 23 00:18:28 2013 +0100
@@ -1384,21 +1384,25 @@
 
 # Copy ports sources into tree
 stamps/ports.stamp: stamps/replace-hotspot.stamp
+if !WITH_ALT_HSBUILD
 	for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
 		      $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
 	  link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
 	  cp -rv $(SRC_DIR_LINK) $$target $$link; \
 	  chmod -R ug+rwX $$link; \
 	done
+endif
 	mkdir -p stamps
 	touch stamps/ports.stamp
 
 clean-ports:
+if !WITH_ALT_HSBUILD
 	for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
 		      $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
 	  link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
 	  rm -rf $$link; \
 	done
+endif
 	rm -f stamps/ports.stamp
 
 stamps/generated.stamp: stamps/ports.stamp