changeset in /hg/icedtea: 2008-02-17 Lillian Angel <langel at red...

[Lillian Angel]

changeset 28aab08e198c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=28aab08e198c
description:
	2008-02-17  Lillian Angel  <langel at redhat.com>

	        * Makfile.am: Defined HOTSPOT_VM_DISTRO.
	        * Makefile.in: Regenerated.
	        * patches/icedtea-zero.patch: Added patch to add libffi_cflags to
	        CFLAGS.
	        * configure.ac: Fixed indentation.
	        * configure: Regenerated.

diffstat:

6 files changed, 26 insertions(+), 3 deletions(-)
ChangeLog                  |    9 +++++++++
Makefile.am                |    2 ++
Makefile.in                |    2 ++
configure                  |    4 ++--
configure.ac               |    2 +-
patches/icedtea-zero.patch |   10 ++++++++++

diffs (98 lines):

diff -r 814d29f894b6 -r 28aab08e198c ChangeLog
--- a/ChangeLog	Sun Feb 17 12:23:42 2008 -0500
+++ b/ChangeLog	Sun Feb 17 15:34:52 2008 -0500
@@ -1,3 +1,12 @@ 2008-02-17  Lillian Angel  <langel at redha
+2008-02-17  Lillian Angel  <langel at redhat.com>
+	
+	* Makfile.am: Defined HOTSPOT_VM_DISTRO.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-zero.patch: Added patch to add libffi_cflags to
+	CFLAGS.
+	* configure.ac: Fixed indentation.
+	* configure: Regenerated.
+
 2008-02-17  Lillian Angel  <langel at redhat.com>
 
 	* configure.ac: Fixed build check for libffi.
diff -r 814d29f894b6 -r 28aab08e198c Makefile.am
--- a/Makefile.am	Sun Feb 17 12:23:42 2008 -0500
+++ b/Makefile.am	Sun Feb 17 15:34:52 2008 -0500
@@ -56,6 +56,7 @@ ICEDTEA_ENV = \
         "BUILD_NUMBER=$(OPENJDK_VERSION)" \
         "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
         "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_VM_DISTRO=\"IcedTea\"" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -86,6 +87,7 @@ ICEDTEA_ENV_ECJ = \
 	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
         "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
         "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_VM_DISTRO=\"IcedTea\"" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
diff -r 814d29f894b6 -r 28aab08e198c Makefile.in
--- a/Makefile.in	Sun Feb 17 12:23:42 2008 -0500
+++ b/Makefile.in	Sun Feb 17 15:34:52 2008 -0500
@@ -241,6 +241,7 @@ ICEDTEA_ENV = \
         "BUILD_NUMBER=$(OPENJDK_VERSION)" \
         "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
         "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_VM_DISTRO=\"IcedTea\"" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -270,6 +271,7 @@ ICEDTEA_ENV_ECJ = \
 	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
         "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
         "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_VM_DISTRO=\"IcedTea\"" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
diff -r 814d29f894b6 -r 28aab08e198c configure
--- a/configure	Sun Feb 17 12:23:42 2008 -0500
+++ b/configure	Sun Feb 17 15:34:52 2008 -0500
@@ -10054,9 +10054,9 @@ fi
           if test "x${LIBFFI_FOUND}" = xno
           then
             { { echo "$as_me:$LINENO: error: Could not find libffi headers - \
-                         Try installing libffi-devel." >&5
+	    Try installing libffi-devel." >&5
 echo "$as_me: error: Could not find libffi headers - \
-                         Try installing libffi-devel." >&2;}
+	    Try installing libffi-devel." >&2;}
    { (exit 1); exit 1; }; }
           fi
 
diff -r 814d29f894b6 -r 28aab08e198c configure.ac
--- a/configure.ac	Sun Feb 17 12:23:42 2008 -0500
+++ b/configure.ac	Sun Feb 17 15:34:52 2008 -0500
@@ -295,7 +295,7 @@ case "$build" in
           if test "x${LIBFFI_FOUND}" = xno
           then
             AC_MSG_ERROR([Could not find libffi headers - \
-                         Try installing libffi-devel.])
+	    Try installing libffi-devel.])
           fi
           AC_SUBST(LIBFFI_CFLAGS)
           AC_SUBST(LIBFFI_LIBS)
diff -r 814d29f894b6 -r 28aab08e198c patches/icedtea-zero.patch
--- a/patches/icedtea-zero.patch	Sun Feb 17 12:23:42 2008 -0500
+++ b/patches/icedtea-zero.patch	Sun Feb 17 15:34:52 2008 -0500
@@ -99,3 +99,13 @@ diff -ru openjdk/hotspot/src/share/vm/ut
       }
  
    STEP(140, "(printing VM operation)" )
+--- gcc.make	2008-02-17 15:21:38.000000000 -0500
++++ openjdk/hotspot/build/linux/makefiles/gcc.make	2008-02-17 15:22:02.000000000 -0500
+@@ -50,6 +50,7 @@
+ PICFLAG = -fPIC
+ else
+ PICFLAG = -fpic
++CFLAGS += $(LIBFFI_CFLAGS)
+ endif
+ 
+ VM_PICFLAG/LIBJVM = $(PICFLAG)