From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate
Date: Sun, 05 Oct 2014 09:58:32 +0200 [thread overview]
Message-ID: <17b8f7627130f84d5e80.1412495912@localhost> (raw)
In-Reply-To: <98b4f7f5e2ea63e41fa1.1412495911@localhost>
Move the checks for AUTORECONF_OPT, GETTEXTIZE_OPT to pkg-autotools.mk,
and for KCONFIG_OPT to pkg-kconfig.mk.
The other checks are used by several infras and are therefore better placed
in pkg-generic.mk.
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -103,6 +103,10 @@
$(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS)
endif
+# These options have been renamed from _OPT to _OPTS in 2014.11
+$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
+
$(2)_CONF_ENV ?=
$(2)_CONF_OPTS ?=
$(2)_MAKE_ENV ?=
@@ -111,7 +115,6 @@
$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
-
#
# Configure step. Only define it if not already defined by the package
# .mk file. And take care of the differences between host and target
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -708,11 +708,8 @@
$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
-$(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))
TARGETS += $(1)
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -36,6 +36,9 @@
$(2)_KCONFIG_OPTS ?=
$(2)_KCONFIG_FIXUP_CMDS ?=
+# This option has been renamed from _OPT to _OPTS in 2014.11
+$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
+
# FOO_KCONFIG_FILE is required
ifndef $(2)_KCONFIG_FILE
$$(error Internal error: no value specified for $(2)_KCONFIG_FILE)
next prev parent reply other threads:[~2014-10-05 7:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-05 7:58 [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Thomas De Schampheleire
2014-10-05 7:58 ` Thomas De Schampheleire [this message]
2014-10-05 8:15 ` [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate Yann E. MORIN
2014-10-05 11:39 ` Thomas Petazzoni
2014-10-05 8:13 ` [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Yann E. MORIN
2014-10-05 11:39 ` 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=17b8f7627130f84d5e80.1412495912@localhost \
--to=patrickdepinguin@gmail.com \
--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