From: Baruch Siach <baruch@tkos.co.il>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/3] package/wget: use the new gettextize infra
Date: Thu, 10 Apr 2014 06:34:23 +0300 [thread overview]
Message-ID: <20140410033422.GR4096@tarshish> (raw)
In-Reply-To: <f318a05b46d762c07c435c133b0a6e836600c6d6.1397081821.git.yann.morin.1998@free.fr>
Hi Yann,
Thanks for noticing.
On Thu, Apr 10, 2014 at 12:20:05AM +0200, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Currently, the gettextization of wget works by chance:
> - host-gettext is added as a dependency to wget;
> - gettextize is run as a post-patch hook.
>
> But the dependencies are only guaranteed to be built and installed
> for the configure step, not the patch step. Becasue post-patch hooks
> are part of the patch step, we have no guarantee that the dependency
> to host-gettext is done by the time we gettextize wget.
>
> This happens to work by chance, since wget sorts alphabetically after
> gettext, so we indeed have host-gettext built and installed by the
> time we need to gettextize wget.
>
> This is prone to fail in the parallel build case, sicne we can no
> longer rely on alphabetical order in that case.
Fixing this only requires using PRE_CONFIGURE_HOOK instead of POST_PATCH_HOOK,
isn't it? Is there anything else this series attempts to fix?
baruch
> Instead, use the new gettextize infra we just added.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/wget/wget.mk | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/package/wget/wget.mk b/package/wget/wget.mk
> index f3a5274..031a8ea 100644
> --- a/package/wget/wget.mk
> +++ b/package/wget/wget.mk
> @@ -15,11 +15,7 @@ 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
> +WGET_GETTEXTIZE = YES
>
> # Prefer full-blown wget over busybox
> ifeq ($(BR2_PACKAGE_BUSYBOX),y)
> --
> 1.8.3.2
--
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 -
next prev parent reply other threads:[~2014-04-10 3:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-09 22:20 [Buildroot] [PATCH 0/3] [RFC] pkg-autotools: introduce infra to gettextize packages (branch yem/gettextize) Yann E. MORIN
2014-04-09 22:20 ` [Buildroot] [PATCH 1/3] pkg-autotools: add support to gettextize a package Yann E. MORIN
2014-04-09 22:20 ` [Buildroot] [PATCH 2/3] manual: add gettextize explanations in the manual Yann E. MORIN
2014-04-10 8:34 ` Thomas De Schampheleire
2014-04-09 22:20 ` [Buildroot] [PATCH 3/3] package/wget: use the new gettextize infra Yann E. MORIN
2014-04-10 3:34 ` Baruch Siach [this message]
2014-04-10 5:12 ` Yann E. MORIN
2014-04-10 21:19 ` [Buildroot] [PATCH 0/3] [RFC] pkg-autotools: introduce infra to gettextize packages (branch yem/gettextize) Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140410033422.GR4096@tarshish \
--to=baruch@tkos.co.il \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox