NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/pkg-autotools: drop support for FOO_GETTEXTIZE

Browse Source 
Remove all support for FOO_GETTEXTIZE and alert users to FOO_AUTOPOINT
as the recommended solution in its stead. We can use the standard
check-deprecated-variable for this, because from a user perspective
FOO_AUTOPOINT is pretty-much a drop-in replacement.

The warnings about FOO_GETTEXTIZE_OPTS are no longer relevant, because
they will only make sense if FOO_GETTEXTIZE was already set.

Signed-off-by: Vincent Fazio <vfazio@gmail.com>
[Arnout:
 - use check-deprecated-variable;
 - remove FOO_GETTEXTIZE_OPTS warnings;
 - remove definition of GETTEXTIZE]
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Vincent Fazio 2023-02-21 11:22:03 -06:00 committed by Arnout Vandecappelle
parent 98de5e4aad
commit e32123b866
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
package/pkg-autotools.mk
View File

@ -87,14 +87,6 @@ define CONFIGURE_FIX_POWERPC64_HOOK
support/scripts/fix-configure-powerpc64.sh $($(PKG)_DIR)
endef
#
# Hook to gettextize the package if needed
#
define GETTEXTIZE_HOOK
@$(call MESSAGE,"Gettextizing")
$(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE)
endef
#
# Hook to autoreconf the package if needed
#
@ -144,14 +136,6 @@ ifndef $(2)_AUTORECONF
endif
endif
ifndef $(2)_GETTEXTIZE
ifdef $(3)_GETTEXTIZE
$(2)_GETTEXTIZE = $$($(3)_GETTEXTIZE)
else
$(2)_GETTEXTIZE ?= NO
endif
endif
ifndef $(2)_AUTOPOINT
ifdef $(3)_AUTOPOINT
$(2)_AUTOPOINT = $$($(3)_AUTOPOINT)
@ -245,13 +229,8 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
ifeq ($$($(2)_AUTORECONF),YES)
# This has to come before autoreconf
ifeq ($$($(2)_GETTEXTIZE),YES)
$(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK
$(2)_DEPENDENCIES += host-gettext
$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true
# autopoint is provided by gettext
else ifeq ($$($(2)_AUTOPOINT),YES)
ifeq ($$($(2)_AUTOPOINT),YES)
$(2)_DEPENDENCIES += host-gettext
$(2)_AUTORECONF_ENV += AUTOPOINT=$$(HOST_DIR)/bin/autopoint
else

9
package/pkg-generic.mk
View File

@ -1207,14 +1207,7 @@ $(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)_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
$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE,$(2)_AUTOPOINT))
PACKAGES += $(1)