From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Fri, 18 Jul 2014 22:57:10 +0200
Subject: [Buildroot] [PATCH v2] infra/pkg-autotools: cleanup the
	gettextize step
In-Reply-To: <1405705969-26342-1-git-send-email-yann.morin.1998@free.fr>
References: <1405705969-26342-1-git-send-email-yann.morin.1998@free.fr>
Message-ID: <20140718205710.GF3630@free.fr>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

All,

On 2014-07-18 19:52 +0200, Yann E. MORIN spake thusly:
> Align the way we call gettextize to the way we call autoreconf:
>   - provide the $(GETTEXTIZE) variable
>   - pass $(HOST_CONFIGURE_OPTS) in the environment
>   - pass the fully-qualified path to autom4te
>   - use of -f even if the package provides its own options
> 
> Some eye-candy in the output of gettextize.
> 
> Thanks to Gustavo for pointing out the discrepancy between the way we
> call gettextize and the way we call autoreconf, and to Thomas for the
> live debug session. ;-)
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  package/gettext/gettext.mk |  8 ++++++++
>  package/pkg-autotools.mk   | 10 +++-------
>  2 files changed, 11 insertions(+), 7 deletions(-)
> 
> diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
> index c8ef765..924f541 100644
> --- a/package/gettext/gettext.mk
> +++ b/package/gettext/gettext.mk
> @@ -57,6 +57,12 @@ endef
>  
>  GETTEXT_POST_INSTALL_TARGET_HOOKS += GETTEXT_REMOVE_UNNEEDED
>  
> +define GETTEXT_GETTEXTIZE_EYE_CANDY
> +	$(SED) '/Press Return\|read dummy/d' $(HOST_DIR)/usr/bin/gettextize
> +endef
> +
> +HOST_GETTEXT_POST_INSTALL_HOOKS += GETTEXT_GETTEXTIZE_EYE_CANDY
> +
>  # Force build with NLS support, otherwise libintl is not built
>  # This is needed because some packages (eg. libglib2) requires
>  # locales, but do not properly depend on BR2_ENABLE_LOCALE, and
> @@ -72,5 +78,7 @@ define HOST_GETTEXT_GETTEXTIZE_CONFIRMATION
>  endef
>  HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_GETTEXTIZE_CONFIRMATION
>  
> +GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/usr/bin/autm4te $(HOST_DIR)/usr/bin/gettextize -f

Sigh, I forgot to commit the typo s/autm4te/autom4te/ :-(

Will repsin shortly...

Regards,
Yann E. MORIN.

>  $(eval $(autotools-package))
>  $(eval $(host-autotools-package))
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> index 557413d..53bca30 100644
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -95,12 +95,8 @@ ifndef $(2)_GETTEXTIZE
>   endif
>  endif
>  
> -ifndef $(2)_GETTEXTIZE_OPT
> - ifdef $(3)_GETTEXTIZE_OPT
> -  $(2)_GETTEXTIZE_OPT = $$($(3)_GETTEXTIZE_OPT)
> - else
> -  $(2)_GETTEXTIZE_OPT ?= -f
> - endif
> +ifeq ($(4),host)
> + $(2)_GETTEXTIZE_OPT ?= $$($(3)_GETTEXTIZE_OPT)
>  endif
>  
>  ifeq ($(4),host)
> @@ -220,7 +216,7 @@ endif
>  #
>  define GETTEXTIZE_HOOK
>  	@$$(call MESSAGE,"Gettextizing")
> -	$(Q)cd $$($$(PKG)_SRCDIR) && $(HOST_DIR)/usr/bin/gettextize $$($$(PKG)_GETTEXTIZE_OPT)
> +	$(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPT)
>  endef
>  
>  #
> -- 
> 1.9.1
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'