瀏覽代碼

package/pkg-autotools: drop FOO_GETTEXTIZE_OPTS support

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@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
Vincent Fazio 2 年之前
父節點
當前提交
5672e74fdc
共有 2 個文件被更改,包括 9 次插入6 次删除
  1. 1 5
      package/pkg-autotools.mk
  2. 8 1
      package/pkg-generic.mk

+ 1 - 5
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

+ 8 - 1
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),)