[Buildroot] [PATCH 1/2] gettext: make host gettextize non-interactive

[Buildroot] [PATCH 1/2] gettext: make host gettextize non-interactive

[Gustavo Zacarias]

Make the host gettextize tool non-interactive to avoid stalling for user
confirmation when using it to fix up a package.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/gettext/gettext.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 748c2a5..b5efa76 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -57,5 +57,11 @@ endef
 endif
 endif # GETTEXT_TOOLS = n
 
+# Disable interactive confirmation in host gettextize for package fixups
+define HOST_GETTEXT_GETTEXTIZE_CONFIRMATION
+	$(SED) '/read dummy/d' $(HOST_DIR)/usr/bin/gettextize
+endef
+HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_GETTEXTIZE_CONFIRMATION
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
1.8.3.2

[Buildroot] [PATCH 2/2] wget: fix autoreconf brokeness

[Gustavo Zacarias]

Fix failed AUTORECONF under certain circumstances where gettext infra is
much newer (>= 0.18) than what wget source expects (~ 0.17).
Do this by gettextizing the source before AUTORECONFing.
If this becomes common we may need a FOO_GETTEXTIZE generic option, but
for now this seems to be the only package that needs so. Fixes:
http://autobuild.buildroot.net/results/c0f/c0f7c801f61fdc310cde64342060b00a70155431/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/wget/wget.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index 80f8314..f3a5274 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -13,6 +13,14 @@ WGET_LICENSE_FILES = COPYING
 # patching gnulib .m4 file
 WGET_AUTORECONF = YES
 
+# Ugly kludge to fix autoreconf with old gettext infra
+# We need to gettextize before autoreconf to upgrade
+WGET_DEPENDENCIES += host-gettext
+define WGET_GETTEXTIZE
+	cd $(@D) ; $(HOST_DIR)/usr/bin/gettextize -f
+endef
+WGET_POST_PATCH_HOOKS += WGET_GETTEXTIZE
+
 # Prefer full-blown wget over busybox
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 	WGET_DEPENDENCIES += busybox
-- 
1.8.3.2

[Buildroot] [PATCH 2/2] wget: fix autoreconf brokeness

[Baruch Siach]

Hi Gustavo,

On Thu, Apr 03, 2014 at 10:43:31AM -0300, Gustavo Zacarias wrote:
> Fix failed AUTORECONF under certain circumstances where gettext infra is
> much newer (>= 0.18) than what wget source expects (~ 0.17).
> Do this by gettextizing the source before AUTORECONFing.
> If this becomes common we may need a FOO_GETTEXTIZE generic option, but
> for now this seems to be the only package that needs so. Fixes:
> http://autobuild.buildroot.net/results/c0f/c0f7c801f61fdc310cde64342060b00a70155431/
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Tested-by: Baruch Siach <baruch@tkos.co.il>

Thanks,
baruch

> ---
>  package/wget/wget.mk | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/package/wget/wget.mk b/package/wget/wget.mk
> index 80f8314..f3a5274 100644
> --- a/package/wget/wget.mk
> +++ b/package/wget/wget.mk
> @@ -13,6 +13,14 @@ WGET_LICENSE_FILES = COPYING
>  # patching gnulib .m4 file
>  WGET_AUTORECONF = YES
>  
> +# Ugly kludge to fix autoreconf with old gettext infra
> +# We need to gettextize before autoreconf to upgrade
> +WGET_DEPENDENCIES += host-gettext
> +define WGET_GETTEXTIZE
> +	cd $(@D) ; $(HOST_DIR)/usr/bin/gettextize -f
> +endef
> +WGET_POST_PATCH_HOOKS += WGET_GETTEXTIZE
> +
>  # Prefer full-blown wget over busybox
>  ifeq ($(BR2_PACKAGE_BUSYBOX),y)
>  	WGET_DEPENDENCIES += busybox

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH 1/2] gettext: make host gettextize non-interactive

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Thu,  3 Apr 2014 10:43:30 -0300, Gustavo Zacarias wrote:
> Make the host gettextize tool non-interactive to avoid stalling for user
> confirmation when using it to fix up a package.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/gettext/gettext.mk | 6 ++++++
>  1 file changed, 6 insertions(+)

Both applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com