[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openjdk-distro-pkg-dev
Subject:    /hg/icedtea6: Handle the ENABLE_HG case for extract-openjdk.
From:       mark () klomp ! org (Mark Wielaard)
Date:       2010-09-30 10:18:07
Message-ID: 1285841887.2465.7.camel () hermans ! wildebeest ! org
[Download RAW message or body]

Hi Andrew,

On Thu, 2010-09-30 at 09:33 +0000, andrew at icedtea.classpath.org wrote:
> changeset 48029753c45f in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=48029753c45f
> author: Andrew John Hughes <ahughes at redhat.com>
> date: Thu Sep 30 10:33:22 2010 +0100
> 
> 	Handle the ENABLE_HG case for extract-openjdk.
> 
> 	2010-09-29 Andrew John Hughes <ahughes at redhat.com>
> 
> 	 * Makefile.am: (download-openjdk): Clone OpenJDK to
> 	openjdk.hg not openjdk. (clean-download-openjdk):
> 	Remove openjdk.hg. (extract-openjdk): Handle the ENABLE_HG
> 	case by making a hardlinked copy of openjdk.hg
> [...]
> @@ -820,7 +821,14 @@ clean-extract: clean-extract-openjdk cle
>  
>  stamps/extract-openjdk.stamp: stamps/download.stamp
>  if OPENJDK_SRC_DIR_FOUND
> -	cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk
> +	if ! test -d openjdk ; then \
> +	  cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
> +	fi
> +else
> +if USE_HG
> +	if ! test -d openjdk ; then \
> +	  cp -pPRl openjdk.hg openjdk ; \
> +	fi
>  else
>  	set -e ; \
>  	if ! test -d openjdk ; \

You introduce an extra "else" and "if" here that aren't closed by an
extra "fi". This causes autogen.sh to fail with:

        Makefile.am:2424: unterminated conditionals:
        OPENJDK_SRC_DIR_FOUND_FALSE
        Makefile.am:2078: CONFIGURE_ARGS was already defined in
        condition TRUE, which includes condition !
        OPENJDK_SRC_DIR_FOUND ...
        configure.ac:451: ... `CONFIGURE_ARGS' previously defined here
        /usr/share/automake-1.11/am/install.am: install was already
        defined in condition TRUE, which includes condition !
        OPENJDK_SRC_DIR_FOUND ...
        Makefile.am:576: ... `install' previously defined here
        autoreconf: automake failed with exit status: 1

Could you take a look where this else/if needs and extra fi?

Thanks,

Mark


[prev in list] [next in list] [prev in thread] [next in thread]