[RFC] PR1118: Synchronize CACAO sections with icedtea7

[Andrew Hughes]

----- Original Message -----
> > Is this for 6? 7? 8?
> 
> I seem to have messed up the threading... It's for 6.
> 

I think 6 is actually more up-to-date than 7.

The bug was filed to get the actual changesets in sync.  Taking
on the whole Makefile is a much bigger issue, covered by the tracker
bug that PR1118 blocks.

> >>  if ENABLE_PULSE_JAVA
> >>  ICEDTEA_PATCHES += \
> >>       patches/pulse-soundproperties.patch
> >> @@ -591,11 +585,6 @@
> >>       VERBOSE="$(VERBOSE)" \
> >>       ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)"
> >>
> >> -if ENABLE_CACAO
> >> -ICEDTEA_ENV += \
> >> -     ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
> >> -endif
> >> -
> >
> > Why is this being removed?
> 
> I'm not sure what it is for, and I hoped someone would comment on it
> ;). I thought it was not there in 7, but it seems I was mistaken.
> Will
> need to reconsider.
> 
> >>  if ENABLE_JAMVM
> >>  ICEDTEA_ENV += \
> >>       ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)"
> >> @@ -1036,14 +1025,14 @@
> >>  if !USE_SYSTEM_CACAO
> >>  if USE_ALT_CACAO_SRC_DIR
> >>       set -e ; \
> >> -     if ! test -d cacao ; \
> >> +     if ! test -d cacao/cacao ; \
> >
> > I seem to remember this is a previous fix.  I'd prefer direct
> > backports of existing fixes.
> 
> Ok, I'll try to track this down.
> 

I was thinking of this:

2012-08-09  Stefan Ring  <stefan at complang.tuwien.ac.at>

	* Makefile.am: copy entire CACAO directory, including .hg

but that's to the mkdir not the test.

The change in 7 is part of a big cleanup patch which I'd rather wasn't
backported as is, so just include this single change, assuming it doesn't
break anything.

> >> @@ -2112,8 +2101,8 @@
> >>         --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk
> >>         \
> >>         --with-java-runtime-library-classes=$(RUNTIME) \
> >>         --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
> >> -     $(ARCH_PREFIX) $(MAKE) install
> >> -     ln -s server
> >> $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
> >> +     $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
> >> +     ln -sf server
> >> $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
> >
> > Has CACAO always supported parallel make or is this a recent fix?
> 
> Always been supported. It always bugged me that the icedtea build was
> not using it. If I had only known how easy it was to add...
> 

Ok, so I suggest just adding a patch to change the test & add parallel
jobs, assuming it builds.
-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07