changeset in /hg/icedtea6: 2008-02-15 Lillian Angel <langel at re...

[Lillian Angel]

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

	        * patches/icedtea-zero.patch: Added patch to add LIBFFI_CFLAGS to
	        CFLAGS.
	        * configure.ac: Added conditional check for libffi.
	        * configure: Regenerated.

diffstat:

4 files changed, 15 insertions(+), 3 deletions(-)
ChangeLog                  |    2 ++
configure                  |    4 ++--
configure.ac               |    2 +-
patches/icedtea-zero.patch |   10 ++++++++++

diffs (55 lines):

diff -r 1ea2191a666f -r f4c290e9611f ChangeLog
--- a/ChangeLog	Sun Feb 17 12:44:22 2008 -0500
+++ b/ChangeLog	Sun Feb 17 15:39:42 2008 -0500
@@ -1,5 +1,7 @@ 2008-02-15  Lillian Angel  <langel at redha
 2008-02-15  Lillian Angel  <langel at redhat.com>
 
+	* patches/icedtea-zero.patch: Added patch to add LIBFFI_CFLAGS to
+	CFLAGS.
 	* configure.ac: Added conditional check for libffi.
 	* configure: Regenerated.
 
diff -r 1ea2191a666f -r f4c290e9611f configure
--- a/configure	Sun Feb 17 12:44:22 2008 -0500
+++ b/configure	Sun Feb 17 15:39:42 2008 -0500
@@ -10051,9 +10051,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 1ea2191a666f -r f4c290e9611f configure.ac
--- a/configure.ac	Sun Feb 17 12:44:22 2008 -0500
+++ b/configure.ac	Sun Feb 17 15:39:42 2008 -0500
@@ -292,7 +292,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 1ea2191a666f -r f4c290e9611f patches/icedtea-zero.patch
--- a/patches/icedtea-zero.patch	Sun Feb 17 12:44:22 2008 -0500
+++ b/patches/icedtea-zero.patch	Sun Feb 17 15:39:42 2008 -0500
@@ -99,3 +99,13 @@ diff -ru openjdk/hotspot/src/share/vm/ut
  
  LINK_VM = $(LINK_LIB.c)
  
+--- gcc.make	2008-02-17 15:37:26.000000000 -0500
++++ openjdk/hotspot/build/linux/makefiles/gcc.make	2008-02-17 15:37:58.000000000 -0500
+@@ -57,6 +57,7 @@
+ 
+ VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
+ 
++CFLAGS += $(LIBFFI_CFLAGS)
+ CFLAGS += $(VM_PICFLAG)
+ CFLAGS += -fno-rtti
+ CFLAGS += -fno-exceptions