[Buildroot] [PATCH] infar/pkg-autotools: cleanup the gettextize step

[Buildroot] [PATCH] infar/pkg-autotools: cleanup the gettextize step

[Yann E. MORIN]

Align the way to call gettextize to the way we call autoreconf.
Use of -f even if the package provides its own options.
Soem eye-candy in the output of gettextize.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 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..86fcda3 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) $(HOST_DIR)/usr/bin/gettextize -f
+
 $(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

[Buildroot] [PATCH] infar/pkg-autotools: cleanup the gettextize step

[Thomas De Schampheleire]

Hi Yann,

Commit title: infra


"Yann E. MORIN" <yann.morin.1998@free.fr> schreef:
>Align the way to call gettextize to the way we call autoreconf.
>Use of -f even if the package provides its own options.
>Soem eye-candy in the output of gettextize.

Some

Best regards,
Thomas

[Buildroot] [PATCH] infar/pkg-autotools: cleanup the gettextize step

[Yann E. MORIN]

Thomas, All,

On 2014-07-18 19:34 +0200, Thomas De Schampheleire spake thusly:
> Commit title: infra
> 
> 
> "Yann E. MORIN" <yann.morin.1998@free.fr> schreef:
> >Align the way to call gettextize to the way we call autoreconf.
> >Use of -f even if the package provides its own options.
> >Soem eye-candy in the output of gettextize.
> 
> Some

Thanks! That was anyway a quick dump of a local patch to share with
Thomas P. for a debug session.

I will fix those typoes before I re-submit. Thanks! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'