changeset in /hg/icedtea6: Fix CACAO build on ppc64 with 32-bit ...

[Andrew John Hughes]

changeset c6e9607b19f0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c6e9607b19f0
description:
	Fix CACAO build on ppc64 with 32-bit userland.

	2008-12-04  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Prefix make invocations with
		ARCH_PREFIX.  Pass the host, target and
		build aliases through to the CACAO sub-configure.
		* acinclude.m4:
		Define ARCH_PREFIX to ${LINUX32} for
		x86 and ppc architectures.
		* configure.ac:
		Check for linux32.

diffstat:

4 files changed, 26 insertions(+), 7 deletions(-)
ChangeLog    |   12 ++++++++++++
Makefile.am  |   17 ++++++++++-------
acinclude.m4 |    3 +++
configure.ac |    1 +

diffs (131 lines):

diff -r 0256f5de086a -r c6e9607b19f0 ChangeLog
--- a/ChangeLog	Thu Dec 04 09:03:27 2008 -0500
+++ b/ChangeLog	Thu Dec 04 17:24:48 2008 +0000
@@ -1,3 +1,15 @@ 2008-12-04  Gary Benson  <gbenson at redhat
+2008-12-04  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Prefix make invocations with
+	ARCH_PREFIX.  Pass the host, target and
+	build aliases through to the CACAO sub-configure.
+	* acinclude.m4:
+	Define ARCH_PREFIX to ${LINUX32} for
+	x86 and ppc architectures.
+	* configure.ac:
+	Check for linux32.
+
 2008-12-04  Gary Benson  <gbenson at redhat.com>
 
 	* .hgignore: Ignore rt/javax/script/*.
diff -r 0256f5de086a -r c6e9607b19f0 Makefile.am
--- a/Makefile.am	Thu Dec 04 09:03:27 2008 -0500
+++ b/Makefile.am	Thu Dec 04 17:24:48 2008 +0000
@@ -1047,7 +1047,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 	$(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
 	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
 	stamps/pulse-java.stamp
-	$(MAKE) \
+	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make/ \
 	  $(ICEDTEA_BUILD_TARGET)
@@ -1110,7 +1110,7 @@ stamps/icedtea-debug.stamp: stamps/boots
 	$(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
 	extra-lib/about.jar stamps/cacao.stamp \
 	stamps/pulse-java.stamp
-	$(MAKE) \
+	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make \
 	  $(ICEDTEA_DEBUG_BUILD_TARGET)
@@ -1169,7 +1169,7 @@ endif
 	touch stamps/icedtea-debug.stamp
 
 clean-icedtea: stamps/extract.stamp
-	$(MAKE) \
+	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make clobber
 	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
@@ -1196,7 +1196,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstr
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
-	$(MAKE) \
+	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/control/make \
 	  $(ICEDTEA_BUILD_TARGET)
@@ -1210,7 +1210,7 @@ hotspot:
 	rm -f stamps/bootstrap-directory-symlink-ecj.stamp
 	rm -f stamps/icedtea-ecj.stamp
 	rm -f stamps/icedtea-against-ecj.stamp
-	$(MAKE) hotspot-helper
+	$(ARCH_PREFIX) $(MAKE) hotspot-helper
 	cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
 	   $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/server
 	@echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
@@ -1218,13 +1218,13 @@ hotspot-helper: stamps/bootstrap-directo
 hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
-	$(MAKE) \
+	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/control/make hotspot
 
 clean-icedtea-ecj: stamps/extract-ecj.stamp
 	rm -f stamps/icedtea-ecj.stamp
-	$(MAKE) \
+	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/control/make clobber
 
@@ -1482,6 +1482,9 @@ if !USE_SYSTEM_CACAO
 if !USE_SYSTEM_CACAO
 	cd cacao/cacao && \
 	./configure \
+	  --host=$(host_alias) \
+	  --build=$(build_alias) \
+	  --target=$(target_alias) \
 	  --prefix=$(abs_top_builddir)/cacao/install \
 	  --with-java-runtime-library=openjdk \
 	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
diff -r 0256f5de086a -r c6e9607b19f0 acinclude.m4
--- a/acinclude.m4	Thu Dec 04 09:03:27 2008 -0500
+++ b/acinclude.m4	Thu Dec 04 17:24:48 2008 +0000
@@ -10,6 +10,7 @@ AC_DEFUN([SET_ARCH_DIRS],
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
       JRE_ARCH_DIR=i386
+      ARCH_PREFIX=${LINUX32}
       ;;
     alpha*-*-*)
       BUILD_ARCH_DIR=alpha
@@ -35,6 +36,7 @@ AC_DEFUN([SET_ARCH_DIRS],
       BUILD_ARCH_DIR=ppc
       INSTALL_ARCH_DIR=ppc
       JRE_ARCH_DIR=ppc
+      ARCH_PREFIX=${LINUX32}
        ;;
     powerpc64-*-*)
       BUILD_ARCH_DIR=ppc64
@@ -60,6 +62,7 @@ AC_DEFUN([SET_ARCH_DIRS],
   AC_SUBST(BUILD_ARCH_DIR)
   AC_SUBST(INSTALL_ARCH_DIR)
   AC_SUBST(JRE_ARCH_DIR)
+  AC_SUBST(ARCH_PREFIX)
 ])
 
 AC_DEFUN([FIND_JAVAC],
diff -r 0256f5de086a -r c6e9607b19f0 configure.ac
--- a/configure.ac	Thu Dec 04 09:03:27 2008 -0500
+++ b/configure.ac	Thu Dec 04 17:24:48 2008 +0000
@@ -34,6 +34,7 @@ AC_PATH_TOOL([LSB_RELEASE],[lsb_release]
 AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
 AC_CHECK_WITH_GCJ
 AC_CHECK_WITH_HOTSPOT_BUILD
+AC_PATH_TOOL([LINUX32],[linux32])
 
 AC_MSG_CHECKING([for a JDK home directory])
 AC_ARG_WITH([gcj-home],