[Buildroot] [PATCH v2] Makefile: target-purgelocales: fix top-level parallel make support

[Arnout Vandecappelle]

On 29/04/14 17:32, Fabio Porcedda wrote:
> The "target-purgelocales" target must be executed after all the other
> targets and before the "target-finalize" target, so create a
> TARGET_PURGE_LOCALES variable containing the commands of the target
> "target-purgelocales" and add it at the beginning of the
> "target-finalize" target.
> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda at gmail.com>
> Cc: Arnout Vandecappelle <arnout at mind.be>
> Cc: Thomas De Schampheleire <patrickdepinguin at gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> Cc: Peter Korsgaard <jacmet at uclibc.org>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>


 Regards,
 Arnout

> ---
> v2:
>   - rewrite the patch following Arnout suggestion
> 
>  Makefile | 40 +++++++++++++++++++---------------------
>  1 file changed, 19 insertions(+), 21 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index eff408b..00e9798 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -391,10 +391,6 @@ include system/system.mk
>  
>  include $(BR2_EXTERNAL)/external.mk
>  
> -ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
> -TARGETS += target-purgelocales
> -endif
> -
>  ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
>  ifneq ($(GENERATE_LOCALE),)
>  TARGETS += target-generatelocales
> @@ -509,9 +505,28 @@ endif
>  STRIP_FIND_CMD += -type f \( -perm /111 -o -name '*.so*' \)
>  STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print
>  
> +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
> +LOCALE_WHITELIST = $(BUILD_DIR)/locales.nopurge
> +LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
> +
> +define TARGET_PURGE_LOCALES
> +	rm -f $(LOCALE_WHITELIST)
> +	for i in $(LOCALE_NOPURGE); do echo $$i >> $(LOCALE_WHITELIST); done
> +
> +	for dir in $(wildcard $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/man /usr/share/man /usr/lib/locale)); \
> +	do \
> +		for lang in $$(cd $$dir; ls .|grep -v man); \
> +		do \
> +			grep -qx $$lang $(LOCALE_WHITELIST) || rm -rf $$dir/$$lang; \
> +		done; \
> +	done
> +endef
> +endif
> +
>  $(TARGETS_ROOTFS): target-finalize
>  
>  target-finalize: $(TARGETS)
> +	$(TARGET_PURGE_LOCALES)
>  	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
>  		$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
>  		$(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake
> @@ -575,23 +590,6 @@ endif
>  		$(call MESSAGE,"Executing post-build script $(s)"); \
>  		$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
>  
> -ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
> -LOCALE_WHITELIST = $(BUILD_DIR)/locales.nopurge
> -LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
> -
> -target-purgelocales:
> -	rm -f $(LOCALE_WHITELIST)
> -	for i in $(LOCALE_NOPURGE); do echo $$i >> $(LOCALE_WHITELIST); done
> -
> -	for dir in $(wildcard $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/man /usr/share/man /usr/lib/locale)); \
> -	do \
> -		for lang in $$(cd $$dir; ls .|grep -v man); \
> -		do \
> -			grep -qx $$lang $(LOCALE_WHITELIST) || rm -rf $$dir/$$lang; \
> -		done; \
> -	done
> -endif
> -
>  ifneq ($(GENERATE_LOCALE),)
>  # Generate locale data. Basically, we call the localedef program
>  # (built by the host-localedef package) for each locale. The input
> 

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