Mercurial > hg > release > icedtea6-1.6

changeset 714:e58dd24ebca2 cacao

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-02-15 Lillian Angel <langel@redhat.com> * patches/icedtea-zero.patch: Added patch to add LIBFFI_CFLAGS to CFLAGS. * configure.ac: Added conditional check for libffi. * configure: Regenerated.
author Lillian Angel <langel@redhat.com>
date Sun, 17 Feb 2008 15:39:42 -0500
parents 0e25fc459f83
children 9f09fe26b5b9
files ChangeLog configure configure.ac patches/icedtea-zero.patch
diffstat 4 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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@redhat.com>
 
+	* patches/icedtea-zero.patch: Added patch to add LIBFFI_CFLAGS to
+	CFLAGS.
 	* configure.ac: Added conditional check for libffi.
 	* configure: Regenerated.
 
--- a/configure	Sun Feb 17 12:44:22 2008 -0500
+++ b/configure	Sun Feb 17 15:39:42 2008 -0500
@@ -10093,9 +10093,9 @@
           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
 
--- a/configure.ac	Sun Feb 17 12:44:22 2008 -0500
+++ b/configure.ac	Sun Feb 17 15:39:42 2008 -0500
@@ -293,7 +293,7 @@
           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)
--- 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 @@
  
  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