Mercurial > hg > release > icedtea7-2.0
changeset 2423:eff72c004141
PR103: Usage of native2ascii during bootstrap.
2011-02-22 Andrew John Hughes <ahughes@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.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 25 May 2011 01:37:57 +0100 |
| parents | 3024025d7759 |
| children | c12aafe2de1b |
| files | ChangeLog Makefile.am NEWS acinclude.m4 configure.ac |
| diffstat | 5 files changed, 50 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 23 15:52:47 2011 +0100 +++ b/ChangeLog Wed May 25 01:37:57 2011 +0100 @@ -1,3 +1,13 @@ +2011-02-22 Andrew John Hughes <ahughes@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-05-23 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4:
--- a/Makefile.am Mon May 23 15:52:47 2011 +0100 +++ b/Makefile.am Wed May 25 01:37:57 2011 +0100 @@ -1678,6 +1678,7 @@ ln -sf $(JAVAH) $(STAGE1_BOOT_DIR)/bin/javah ln -sf $(RMIC) $(STAGE1_BOOT_DIR)/bin/rmic ln -sf $(JAR) $(STAGE1_BOOT_DIR)/bin/jar + ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii ln -sf ../../../javac $(STAGE1_BOOT_DIR)/bin/javac ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap mkdir -p $(STAGE1_BOOT_DIR)/lib/endorsed && \
--- a/NEWS Mon May 23 15:52:47 2011 +0100 +++ b/NEWS Wed May 25 01:37:57 2011 +0100 @@ -12,6 +12,7 @@ - PR616, PR99: Don't statically link libstdc++ - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. - PR714: Forwardport replace-hotspot support from IcedTea6. + - PR103: Usage of native2ascii during bootstrap * JamVM - Ignore all unknown options. - Handle overflow in getPhysicalMemory().
--- a/acinclude.m4 Mon May 23 15:52:47 2011 +0100 +++ b/acinclude.m4 Wed May 25 01:37:57 2011 +0100 @@ -479,6 +479,43 @@ 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_WITH_OPENJDK_SRC_ZIP], [ AC_MSG_CHECKING([for an OpenJDK source zip])