[Buildroot] [PATCH 01/15] package/pkg-autotools: drop FOO_GETTEXTIZE_OPTS support
Arnout Vandecappelle
arnout at mind.be
Sat Mar 25 20:27:04 UTC 2023
Hi Vincent
On 21/02/2023 18:21, Vincent Fazio wrote:
> From: Vincent Fazio <vfazio at gmail.com>
>
> No package in the current tree is currently utilizing this option.
>
> The long term solution is to use autopoint over gettextize in which case
> these options aren't relevant anyway.
>
> Signed-off-by: Vincent Fazio <vfazio at gmail.com>
Series applied to master (well, I'm still busy with it so it may get
interrupted...). I'll make some comments on individual patches.
I must say, for a series that touches infrastructure and consist of 15
patches, I think it's incredible that v1 gets applied directly without need for
a v2. Kudos!
Regards,
Arnout
> ---
> package/pkg-autotools.mk | 6 +-----
> package/pkg-generic.mk | 9 ++++++++-
> 2 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> index 717ff81593..55d95d204e 100644
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -92,7 +92,7 @@ endef
> #
> define GETTEXTIZE_HOOK
> @$(call MESSAGE,"Gettextizing")
> - $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) $($(PKG)_GETTEXTIZE_OPTS)
> + $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE)
> endef
>
> #
> @@ -152,10 +152,6 @@ ifndef $(2)_GETTEXTIZE
> endif
> endif
>
> -ifeq ($(4),host)
> - $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS)
> -endif
> -
> ifeq ($(4),host)
> $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS)
> endif
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 82187d7db9..a6ef5efb5f 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -1206,9 +1206,16 @@ $(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_
> $(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
> $(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
> $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
> -$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
> $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
>
> +# Check for deprecated variables that have no replacement
> +ifneq ($$($(2)_GETTEXTIZE_OPT),)
> +$$(error "$(2)_GETTEXTIZE_OPT is no longer supported. Please fix your .mk file.")
> +endif
> +ifneq ($$($(2)_GETTEXTIZE_OPTS),)
> +$$(error "$(2)_GETTEXTIZE_OPTS is no longer supported. Please fix your .mk file.")
> +endif
> +
> PACKAGES += $(1)
>
> ifneq ($$($(2)_PERMISSIONS),)
More information about the buildroot
mailing list