[RFC] PR1118: Synchronize CACAO sections with icedtea7

[Andrew Hughes]

----- Original Message -----
> Now that I've read PR1120 again, I'm getting the feeling that you had
> something different in mind, but I guess this is still worthwhile. I
> tried to align icedtea 6 and 7 for now.
> 
> Regarding the ability to use the same upstream version for all
> branches, I know that David wanted to work on this. I'm trying to
> find
> out about his status on the CACAO mailing list.
> 

Is this for 6? 7? 8?

> 
> diff -r 36b093404170 -r 84d34cd092c6 Makefile.am
> --- a/Makefile.am	Thu Sep 20 16:33:37 2012 +0100
> +++ b/Makefile.am	Mon Sep 24 21:02:32 2012 +0200
> @@ -453,12 +453,6 @@
>  	patches/cacao/memory.patch
>  endif
>  
> -if ENABLE_CACAO
> -ICEDTEA_PATCHES += \
> -	patches/cacao/ignore-jdi-tests.patch \
> -	patches/cacao/ignore-tests.patch
> -endif
> -

I see you explained this in the other patch.

>  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?

>  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.

>  	then \
>  	  mkdir cacao ; \
>  	  cp -rL $(ALT_CACAO_SRC_DIR) cacao/cacao ; \
>  	fi
>  else
>  	set -e ; \
> -	if ! test -d cacao ; \
> +	if ! test -d cacao/cacao ; \
>  	then \
>  	  mkdir cacao ; \
>  	  $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \
> @@ -1054,7 +1043,7 @@
>  endif
>  endif
>  	mkdir -p stamps
> -	touch stamps/extract-cacao.stamp
> +	touch $@
>  
>  stamps/extract-jamvm.stamp:
>  if BUILD_JAMVM
> @@ -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?

>  endif
>  endif
>  	mkdir -p stamps
> 
> 
> 

-- 
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