[RFC][icedtea6-1.9] Backport of 2436: Fix duplication of absolute path when creating $(ECJ_BOOT_DIR)/lib.

[Dr Andrew John Hughes]

On 13:56 Wed 26 Oct     , Danesh Dadachanji wrote:
> Hi,
> 
> I noticed this bug was still in 1.9 while trying to replace xalan/xerces 
> with xsltproc. The reason 1.9 builds fine is because of the 'mkdir -p' 
> that makes the endorsed dir (Makefile.am:1261). However, once 
> xalan/xerces have been replaced, the endorsed dir is never created and 
> so the build crashes.
> 
> The attached patch is the same as the changeset[1] on HEAD adjusted for 1.9.
> 
> ChangeLog
> +2011-10-26  Danesh Dadachanji  <ddadacha at redhat.com>
> +
> + * Makefile.am:
> + (bootstrap-directory-ecj): Fix double
> + absolute path specification in creation
> + of $(ECJ_BOOT_DIR)/lib.
> +
> 
> Okay for 1.9?
> 
> Regards,
> Danesh
> 
> [1] http://icedtea.classpath.org/hg/icedtea6/rev/513fd50d8c95
> 

Yes.  Good catch.

> diff -r 30ddc2f3dbe4 Makefile.am
> --- a/Makefile.am	Fri Oct 21 15:04:36 2011 +0100
> +++ b/Makefile.am	Wed Oct 26 13:43:46 2011 -0400
> @@ -1280,7 +1280,7 @@ stamps/bootstrap-directory-ecj.stamp: st
>  	  ln -s $(SYSTEM_JDK_DIR)/include/$$i $(ECJ_BOOT_DIR)/include/$$i; \
>  	done
>  # For HotSpot
> -	mkdir -p $(abs_top_builddir)/$(ECJ_BOOT_DIR)/lib && \
> +	mkdir -p $(ECJ_BOOT_DIR)/lib && \
>  	ln -sf $(ECJ_BOOT_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/lib/tools.jar
>  	mkdir -p stamps
>  	touch stamps/bootstrap-directory-ecj.stamp


-- 
Andrew :)

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

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111107/64cb2abb/attachment.bin