changeset in /hg/icedtea6: 2008-02-18 Gary Benson <gbenson at red...

[Gary Benson]

changeset 1545b9448b02 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1545b9448b02
description:
	2008-02-18  Gary Benson  <gbenson at redhat.com>

		* configure.ac: Check for libffi whenever building with zero.
		* Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Pass libffi settings.
		* Makefile.in, configure: Regenerated.

diffstat:

5 files changed, 39 insertions(+), 33 deletions(-)
ChangeLog    |    6 ++++++
Makefile.am  |    8 ++++++--
Makefile.in  |    8 ++++++--
configure    |   24 ++++++++++--------------
configure.ac |   26 +++++++++++---------------

diffs (141 lines):

diff -r f1a5b84676e3 -r 1545b9448b02 ChangeLog
--- a/ChangeLog	Sun Feb 17 16:40:56 2008 -0500
+++ b/ChangeLog	Mon Feb 18 08:04:20 2008 -0500
@@ -1,3 +1,9 @@ 2008-02-17  Mark Wielaard  <mark at klomp.o
+2008-02-18  Gary Benson  <gbenson at redhat.com>
+
+	* configure.ac: Check for libffi whenever building with zero.
+	* Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Pass libffi settings.
+	* Makefile.in, configure: Regenerated.
+
 2008-02-17  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (patch.stamp): Stop and fail when patch doesn't apply.
diff -r f1a5b84676e3 -r 1545b9448b02 Makefile.am
--- a/Makefile.am	Sun Feb 17 16:40:56 2008 -0500
+++ b/Makefile.am	Mon Feb 18 08:04:20 2008 -0500
@@ -74,7 +74,9 @@ ICEDTEA_ENV = \
 	"CLASSPATH=" \
 	"LD_LIBRARY_PATH=" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
-	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+	"LIBFFI_LIBS=$(LIBFFI_LIBS)"
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -110,7 +112,9 @@ ICEDTEA_ENV_ECJ = \
 	"LD_LIBRARY_PATH=" \
 	"GENSRCDIR=$(abs_top_srcdir)/generated" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
-	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+	"LIBFFI_LIBS=$(LIBFFI_LIBS)"
 
 env-ecj:
 	@echo 'unset JAVA_HOME'
diff -r f1a5b84676e3 -r 1545b9448b02 Makefile.in
--- a/Makefile.in	Sun Feb 17 16:40:56 2008 -0500
+++ b/Makefile.in	Mon Feb 18 08:04:20 2008 -0500
@@ -259,7 +259,9 @@ ICEDTEA_ENV = \
 	"CLASSPATH=" \
 	"LD_LIBRARY_PATH=" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
-	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+	"LIBFFI_LIBS=$(LIBFFI_LIBS)"
 
 
 # OpenJDK ecj build environment.
@@ -294,7 +296,9 @@ ICEDTEA_ENV_ECJ = \
 	"LD_LIBRARY_PATH=" \
 	"GENSRCDIR=$(abs_top_srcdir)/generated" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
-	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+	"LIBFFI_LIBS=$(LIBFFI_LIBS)"
 
 
 # OpenJDK Source Preparation Targets
diff -r f1a5b84676e3 -r 1545b9448b02 configure
--- a/configure	Sun Feb 17 16:40:56 2008 -0500
+++ b/configure	Mon Feb 18 08:04:20 2008 -0500
@@ -9979,8 +9979,7 @@ fi
 
 fi
 
-case "$build" in
-        *powerpc*)
+if test "x${CORE_BUILD_TRUE}" = x; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for LIBFFI" >&5
@@ -10052,20 +10051,17 @@ echo "${ECHO_T}yes" >&6; }
 echo "${ECHO_T}yes" >&6; }
 	LIBFFI_FOUND=yes
 fi
-          if test "x${LIBFFI_FOUND}" = xno
-          then
-            { { echo "$as_me:$LINENO: error: Could not find libffi headers - \
-	    Try installing libffi-devel." >&5
+  if test "x${LIBFFI_FOUND}" = xno
+  then
+    { { echo "$as_me:$LINENO: error: Could not find libffi headers - \
+    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
-
-
-        ;;
-        *i*86*)
-        ;;
-esac
+  fi
+fi
+
+
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
diff -r f1a5b84676e3 -r 1545b9448b02 configure.ac
--- a/configure.ac	Sun Feb 17 16:40:56 2008 -0500
+++ b/configure.ac	Mon Feb 18 08:04:20 2008 -0500
@@ -285,20 +285,16 @@ AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_LIBS)
 fi
 
-case "$build" in
-        *powerpc*)
-          dnl Check for libffi headers and libraries.
-          PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no])
-          if test "x${LIBFFI_FOUND}" = xno
-          then
-            AC_MSG_ERROR([Could not find libffi headers - \
-	    Try installing libffi-devel.])
-          fi
-          AC_SUBST(LIBFFI_CFLAGS)
-          AC_SUBST(LIBFFI_LIBS)
-        ;;
-        *i*86*)
-        ;;
-esac
+if test "x${CORE_BUILD_TRUE}" = x; then
+  dnl Check for libffi headers and libraries.
+  PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no])
+  if test "x${LIBFFI_FOUND}" = xno
+  then
+    AC_MSG_ERROR([Could not find libffi headers - \
+    Try installing libffi-devel.])
+  fi
+fi
+AC_SUBST(LIBFFI_CFLAGS)
+AC_SUBST(LIBFFI_LIBS)
 
 AC_OUTPUT