From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arnout Vandecappelle <arnout@mind.be>
Date: Mon, 14 Jul 2014 18:55:02 +0200
Subject: [Buildroot] [PATCH 5 of 6] uclibc: menuconfig: take into
 account initial settings from config file
In-Reply-To: <34f3d55304ad13b63b26.1405338629@localhost>
References: <patchbomb.1405338624@localhost>
 <34f3d55304ad13b63b26.1405338629@localhost>
Message-ID: <53C40B66.7020204@mind.be>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

On 14/07/14 13:50, Thomas De Schampheleire wrote:
> When executing the sequence 'make clean uclibc-menuconfig', the configured
> config file is not taken into account and one starts from the default
> settings.
> 
> This patch adds an explicit target for the config file and lets the
> configure and menuconfig steps depend on it, fixing the problem.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> 
> ---
> rfc->patch:
> - add target for .config to avoid menuconfig copying the config file
>   every time (ThomasP, Arnout)
> - move dependency on patch step from menuconfig to the .config target
> 
>  package/uclibc/uclibc.mk |  12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff -r 1f15cd84996d -r 34f3d55304ad package/uclibc/uclibc.mk
> --- a/package/uclibc/uclibc.mk	Wed Jul 02 21:31:07 2014 +0200
> +++ b/package/uclibc/uclibc.mk	Sun Jun 22 10:37:22 2014 +0200
> @@ -394,7 +394,6 @@
>  	HOSTCC="$(HOSTCC)"
>  
>  define UCLIBC_FIXUP_DOT_CONFIG
> -	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
>  	$(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D)/.config)
>  	$(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH),$(@D)/.config)
>  	$(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D)/.config)
> @@ -533,7 +532,14 @@
>  	$(UCLIBC_INSTALL_UTILS_STAGING)
>  endef
>  
> -uclibc-menuconfig: uclibc-patch
> +$(eval $(generic-package))
> +
> +$(UCLIBC_DIR)/.config: $(UCLIBC_CONFIG_FILE) | uclibc-patch
> +	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
> +
> +$(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.config

 This should be $(UCLIBC_TARGET_CONFIGURE) instead of
$(UCLIBC_DIR)/.stamp_configured.

 Actually, I'd prefer the FOO_TARGET_* variables to be removed completely.
However, as long as they exist, I guess they should be used.

 Other than that, looks good to me.

 Regards,
 Arnout

> +
> +uclibc-menuconfig: $(UCLIBC_DIR)/.config
>  	$(MAKE1) -C $(UCLIBC_DIR) \
>  		$(UCLIBC_MAKE_FLAGS) \
>  		PREFIX=$(STAGING_DIR) \
> @@ -542,8 +548,6 @@
>  		menuconfig
>  	rm -f $(UCLIBC_DIR)/.stamp_{configured,built,target_installed,staging_installed}
>  
> -$(eval $(generic-package))
> -
>  uclibc-update-config: $(UCLIBC_DIR)/.stamp_configured
>  	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
>  
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F