[patch] cacao icedtea6-1.7 pr431 - fix --enable-cacao builds on 32bit systems.

[Andrew John Hughes]

2010/1/19 Xerxes Rånby <xerxes at zafena.se>:
> Hi the attached patch fixes pr431 for --enable-cacao on 32 bit systems.
>
> ok to push to Icedtea6-1.7?
>
> ok to push to Icedtea6?
>
> Cheers
> Xerxes
>

I'm not sure turning on the whole zero build is appropriate and
especially don't want to risk it for the release.  We get this
side-effect because of:

+ifneq ($(ZERO_BUILD), true)
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
+    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+    EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
+  else
+    ifeq ($(ARCH),ia64)
+      else
+        EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+        EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
     endif
endif

in zero/6890308.patch (one of Gary's upstream patches, so don't alter
it).  The correct solution is for cacao to provide a client directory
as well.  Can you try adding a symlink from server to client as part
of the cacao installation in Makefile.am and see if this also solves
the problem?

Thanks,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8