changeset in /hg/icedtea: 2008-02-18 Gary Benson <gbenson at redh...
Lillian Angel
langel at redhat.com
Mon Feb 18 07:09:39 PST 2008
changeset 4ac4ff0b15ec in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4ac4ff0b15ec
description:
2008-02-18 Gary Benson <gbenson at redhat.com>
* patches/icedtea-zero.patch: Correctly locate the platform file.
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:
6 files changed, 62 insertions(+), 36 deletions(-)
ChangeLog | 11 +++++++++++
Makefile.am | 10 +++++++---
Makefile.in | 10 +++++++---
configure | 24 ++++++++++--------------
configure.ac | 26 +++++++++++---------------
patches/icedtea-zero.patch | 17 ++++++++++++++++-
diffs (195 lines):
diff -r 7935c6fa5ea7 -r 4ac4ff0b15ec ChangeLog
--- a/ChangeLog Sun Feb 17 15:45:04 2008 -0500
+++ b/ChangeLog Mon Feb 18 10:02:47 2008 -0500
@@ -1,3 +1,14 @@ 2008-02-17 Lillian Angel <langel at redha
+2008-02-18 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-zero.patch: Correctly locate the platform file.
+
+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 Lillian Angel <langel at redhat.com>
* Makfile.am: Defined HOTSPOT_VM_DISTRO.
diff -r 7935c6fa5ea7 -r 4ac4ff0b15ec Makefile.am
--- a/Makefile.am Sun Feb 17 15:45:04 2008 -0500
+++ b/Makefile.am Mon Feb 18 10:02:47 2008 -0500
@@ -70,7 +70,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'
@@ -87,7 +89,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\"" \
+ "HOTSPOT_VM_DISTRO=IcedTea" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -107,7 +109,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 7935c6fa5ea7 -r 4ac4ff0b15ec Makefile.in
--- a/Makefile.in Sun Feb 17 15:45:04 2008 -0500
+++ b/Makefile.in Mon Feb 18 10:02:47 2008 -0500
@@ -255,7 +255,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.
@@ -271,7 +273,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\"" \
+ "HOTSPOT_VM_DISTRO=IcedTea" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -291,7 +293,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 7935c6fa5ea7 -r 4ac4ff0b15ec configure
--- a/configure Sun Feb 17 15:45:04 2008 -0500
+++ b/configure Mon Feb 18 10:02:47 2008 -0500
@@ -9978,8 +9978,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
@@ -10051,20 +10050,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 7935c6fa5ea7 -r 4ac4ff0b15ec configure.ac
--- a/configure.ac Sun Feb 17 15:45:04 2008 -0500
+++ b/configure.ac Mon Feb 18 10:02:47 2008 -0500
@@ -288,20 +288,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
diff -r 7935c6fa5ea7 -r 4ac4ff0b15ec patches/icedtea-zero.patch
--- a/patches/icedtea-zero.patch Sun Feb 17 15:45:04 2008 -0500
+++ b/patches/icedtea-zero.patch Mon Feb 18 10:02:47 2008 -0500
@@ -6,7 +6,7 @@ diff -ru openjdk-ecj/hotspot/build/linux
LIBS_VM += $(LIBS)
endif
+ifeq ($(SRCARCH), zero)
-+LIBS_VM += -lffi
++LIBS_VM += $(LIBFFI_LIBS)
+endif
LINK_VM = $(LINK_LIB.c)
@@ -109,3 +109,18 @@ diff -ru openjdk/hotspot/src/share/vm/ut
CFLAGS += $(VM_PICFLAG)
CFLAGS += -fno-rtti
CFLAGS += -fno-exceptions
+--- jdk7/hotspot/build/linux/makefiles/buildtree.make 2008-01-29 16:03:30.000000000 -0500
++++ openjdk/hotspot/build/linux/makefiles/buildtree.make 2008-02-18 09:59:36.000000000 -0500
+@@ -63,7 +63,11 @@
+ # For now, until the compiler is less wobbly:
+ TESTFLAGS = -Xbatch -showversion
+
+-PLATFORM_FILE = $(GAMMADIR)/build/$(OS_FAMILY)/platform_$(BUILDARCH)
++ifeq ($(ARCH), zero)
++PLATFORM_FILE = $(GAMMADIR)/build/$(OS_FAMILY)/platform_$(BUILDARCH)
++else
++ PLATFORM_FILE = $(GAMMADIR)/build/$(OS_FAMILY)/platform_$(ARCH)
++endif
+
+ ifdef FORCE_TIERED
+ ifeq ($(VARIANT),tiered)
More information about the distro-pkg-dev
mailing list