/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 513fd50d8c95 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=513fd50d8c95
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 22 02:16:21 2011 +0000

	Fix duplication of absolute path when creating $(ECJ_BOOT_DIR)/lib.

	2011-02-22 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (bootstrap-directory-ecj): Fix double
	absolute path specification in creation of
	$(ECJ_BOOT_DIR)/lib.


changeset 4ffc2aade98c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4ffc2aade98c
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 22 08:34:09 2011 +0000

	PR103: Usage of native2ascii during bootstrap.

	2011-02-22 Andrew John Hughes <ahughes at redhat.com>

	 PR103: Usage of native2ascii during bootstrap.
		* Makefile.am: (bootstrap-directory-ecj): Symlink
	native2ascii.
		* NEWS: Updated.
		* acinclude.m4: (IT_FIND_NATIVE2ASCII): Added.
		* configure.ac: Call IT_FIND_NATIVE2ASCII.


diffstat:

5 files changed, 58 insertions(+), 1 deletion(-)
ChangeLog    |   17 +++++++++++++++++
Makefile.am  |    3 ++-
NEWS         |    1 +
acinclude.m4 |   37 +++++++++++++++++++++++++++++++++++++
configure.ac |    1 +

diffs (113 lines):

diff -r 74f752bcf15d -r 4ffc2aade98c ChangeLog
--- a/ChangeLog	Tue Feb 22 00:35:15 2011 +0000
+++ b/ChangeLog	Tue Feb 22 08:34:09 2011 +0000
@@ -1,3 +1,20 @@ 2011-02-21  Andrew John Hughes  <ahughes
+2011-02-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR103: Usage of native2ascii during bootstrap.
+	* Makefile.am:
+	(bootstrap-directory-ecj): Symlink native2ascii.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_FIND_NATIVE2ASCII): Added.
+	* configure.ac: Call IT_FIND_NATIVE2ASCII.
+
+2011-02-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(bootstrap-directory-ecj): Fix double
+	absolute path specification in creation
+	of $(ECJ_BOOT_DIR)/lib.
+
 2011-02-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Mention cleanups.
diff -r 74f752bcf15d -r 4ffc2aade98c Makefile.am
--- a/Makefile.am	Tue Feb 22 00:35:15 2011 +0000
+++ b/Makefile.am	Tue Feb 22 08:34:09 2011 +0000
@@ -1161,6 +1161,7 @@ stamps/bootstrap-directory-ecj.stamp: st
 	ln -sf $(JAVAH) $(ECJ_BOOT_DIR)/bin/javah
 	ln -sf $(RMIC) $(ECJ_BOOT_DIR)/bin/rmic
 	ln -sf $(JAR) $(ECJ_BOOT_DIR)/bin/jar
+	ln -sf $(NATIVE2ASCII) $(ECJ_BOOT_DIR)/bin/native2ascii
 	ln -sf $(abs_top_builddir)/javac $(ECJ_BOOT_DIR)/bin/javac
 	ln -sf $(abs_top_builddir)/javap $(ECJ_BOOT_DIR)/bin/javap
 	mkdir -p $(ECJ_BOOT_DIR)/lib/endorsed && \
@@ -1185,7 +1186,7 @@ stamps/bootstrap-directory-ecj.stamp: st
 	  ln -s $(SYSTEM_JDK_DIR)/include/$$i $(ECJ_BOOT_DIR)/include/$$i; \
 	done
 # For HotSpot
-	mkdir -p $(abs_top_builddir)/$(ECJ_BOOT_DIR)/lib && \
+	mkdir -p $(ECJ_BOOT_DIR)/lib && \
 	ln -sf $(ECJ_BOOT_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/lib/tools.jar
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
diff -r 74f752bcf15d -r 4ffc2aade98c NEWS
--- a/NEWS	Tue Feb 22 00:35:15 2011 +0000
+++ b/NEWS	Tue Feb 22 08:34:09 2011 +0000
@@ -429,6 +429,7 @@ New in release 1.10 (2011-XX-XX):
   - PR600: HS19 upgrade broke CACAO build on ARM
   - PR616, PR99: Don't statically link libstdc++ or libgcc
   - PR632: patches/security/20110215/6878713.patch breaks shark zero build
+  - PR103: Usage of native2ascii during bootstrap
 * Cleanup
   - Patches are no longer prefixed with 'icedtea-'.
   - All m4 macros are now prefixed with 'IT_' to denote their origin correctly.
diff -r 74f752bcf15d -r 4ffc2aade98c acinclude.m4
--- a/acinclude.m4	Tue Feb 22 00:35:15 2011 +0000
+++ b/acinclude.m4	Tue Feb 22 08:34:09 2011 +0000
@@ -470,6 +470,43 @@ AC_DEFUN([IT_FIND_RMIC],
   fi
   AC_MSG_RESULT(${RMIC})
   AC_SUBST(RMIC)
+])
+
+AC_DEFUN([IT_FIND_NATIVE2ASCII],
+[
+  NATIVE2ASCII_DEFAULT=${SYSTEM_JDK_DIR}/bin/native2ascii
+  AC_MSG_CHECKING([if a native2ascii binary was specified])
+  AC_ARG_WITH([native2ascii],
+              [AS_HELP_STRING(--with-native2ascii,specify location of the native2ascii converter)],
+  [
+    if test "x${withval}" = "xyes"; then
+      NATIVE2ASCII=no
+    else
+      NATIVE2ASCII="${withval}"
+    fi
+  ],
+  [
+    NATIVE2ASCII=no
+  ])
+  AC_MSG_RESULT(${NATIVE2ASCII})
+  if test "x${NATIVE2ASCII}" = "xno"; then
+    NATIVE2ASCII=${NATIVE2ASCII_DEFAULT}
+  fi
+  AC_MSG_CHECKING([if $NATIVE2ASCII is a valid executable])
+  if ! test -x "${NATIVE2ASCII}"; then
+    AC_MSG_RESULT([no])
+    NATIVE2ASCII=""
+    AC_PATH_PROG(NATIVE2ASCII, "native2ascii")
+    if test -z "${NATIVE2ASCII}"; then
+      AC_PATH_PROG(NATIVE2ASCII, "gnative2ascii")
+    fi
+    if test -z "${NATIVE2ASCII}"; then
+      AC_MSG_ERROR("A native2ascii converter was not found.")
+    fi
+  else
+    AC_MSG_RESULT([yes])
+  fi
+  AC_SUBST([NATIVE2ASCII])
 ])
 
 AC_DEFUN([IT_FIND_ENDORSED_JARS],
diff -r 74f752bcf15d -r 4ffc2aade98c configure.ac
--- a/configure.ac	Tue Feb 22 00:35:15 2011 +0000
+++ b/configure.ac	Tue Feb 22 08:34:09 2011 +0000
@@ -153,6 +153,7 @@ IT_FIND_JAVAH
 IT_FIND_JAVAH
 IT_FIND_JAR
 IT_FIND_RMIC
+IT_FIND_NATIVE2ASCII
 if test "x$enable_bootstrap" = "xyes"; then
   IT_FIND_ECJ_JAR
   IT_FIND_XALAN2_JAR