From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 04 of 20] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
Date: Tue, 29 Jul 2014 23:12:31 +0200 [thread overview]
Message-ID: <350c3078ccd9350ebbcd.1406668351@localhost> (raw)
In-Reply-To: <patchbomb.1406668347@localhost>
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_OPT.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
docs/manual/adding-packages-perl.txt | 2 +-
docs/manual/adding-packages-python.txt | 6 +++---
package/gcc/gcc-initial/gcc-initial.mk | 2 +-
package/gcc/gcc-intermediate/gcc-intermediate.mk | 4 ++--
package/pkg-autotools.mk | 4 ++--
package/pkg-python.mk | 12 ++++++------
package/scons/scons.mk | 2 +-
package/util-linux/util-linux.mk | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
diff -r 9b89581eb95a -r 350c3078ccd9 docs/manual/adding-packages-perl.txt
--- a/docs/manual/adding-packages-perl.txt Mon Jul 28 21:28:40 2014 +0200
+++ b/docs/manual/adding-packages-perl.txt Mon Jul 28 21:34:36 2014 +0200
@@ -113,6 +113,6 @@
pass to +make pure_install+ or +perl Build install+ in the install step.
By default, empty.
-* +HOST_PERL_FOO_INSTALL_OPT+, to specify additional options to
+* +HOST_PERL_FOO_INSTALL_OPTS+, to specify additional options to
pass to +make pure_install+ or +perl Build install+ in the install step.
By default, empty.
diff -r 9b89581eb95a -r 350c3078ccd9 docs/manual/adding-packages-python.txt
--- a/docs/manual/adding-packages-python.txt Mon Jul 28 21:28:40 2014 +0200
+++ b/docs/manual/adding-packages-python.txt Mon Jul 28 21:34:36 2014 +0200
@@ -128,16 +128,16 @@
passed automatically by the infrastructure.
* +PYTHON_FOO_INSTALL_TARGET_OPT+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
- +HOST_PYTHON_FOO_INSTALL_OPT+ to specify additional options to pass
+ +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
to the Python +setup.py+ script during the target installation step,
the staging installation step or the host installation,
respectively. Note that the infrastructure is automatically passing
some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT+
or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
- packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT+ (for host
+ packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT+ or
+PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
- packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT+ (for host
+ packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
setuptools packages).
* +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python
diff -r 9b89581eb95a -r 350c3078ccd9 package/gcc/gcc-initial/gcc-initial.mk
--- a/package/gcc/gcc-initial/gcc-initial.mk Mon Jul 28 21:28:40 2014 +0200
+++ b/package/gcc/gcc-initial/gcc-initial.mk Mon Jul 28 21:34:36 2014 +0200
@@ -38,6 +38,6 @@
$(HOST_GCC_COMMON_CONF_ENV)
HOST_GCC_INITIAL_MAKE_OPTS = all-gcc
-HOST_GCC_INITIAL_INSTALL_OPT = install-gcc
+HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc
$(eval $(host-autotools-package))
diff -r 9b89581eb95a -r 350c3078ccd9 package/gcc/gcc-intermediate/gcc-intermediate.mk
--- a/package/gcc/gcc-intermediate/gcc-intermediate.mk Mon Jul 28 21:28:40 2014 +0200
+++ b/package/gcc/gcc-intermediate/gcc-intermediate.mk Mon Jul 28 21:34:36 2014 +0200
@@ -41,9 +41,9 @@
HOST_GCC_INTERMEDIATE_MAKE_OPTS += all-target-libgcc
endif
-HOST_GCC_INTERMEDIATE_INSTALL_OPT = install-gcc
+HOST_GCC_INTERMEDIATE_INSTALL_OPTS = install-gcc
ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-HOST_GCC_INTERMEDIATE_INSTALL_OPT += install-target-libgcc
+HOST_GCC_INTERMEDIATE_INSTALL_OPTS += install-target-libgcc
endif
$(eval $(host-autotools-package))
diff -r 9b89581eb95a -r 350c3078ccd9 package/pkg-autotools.mk
--- a/package/pkg-autotools.mk Mon Jul 28 21:28:40 2014 +0200
+++ b/package/pkg-autotools.mk Mon Jul 28 21:34:36 2014 +0200
@@ -107,7 +107,7 @@
$(2)_CONF_OPT ?=
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
-$(2)_INSTALL_OPT ?= install
+$(2)_INSTALL_OPTS ?= install
$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
@@ -281,7 +281,7 @@
#
ifndef $(2)_INSTALL_CMDS
define $(2)_INSTALL_CMDS
- $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPT) -C $$($$(PKG)_SRCDIR)
+ $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_SRCDIR)
endef
endif
diff -r 9b89581eb95a -r 350c3078ccd9 package/pkg-python.mk
--- a/package/pkg-python.mk Mon Jul 28 21:28:40 2014 +0200
+++ b/package/pkg-python.mk Mon Jul 28 21:34:36 2014 +0200
@@ -45,7 +45,7 @@
HOST_PKG_PYTHON_DISTUTILS_ENV = \
PATH=$(BR_PATH)
-HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
+HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
--prefix=$(HOST_DIR)/usr
# Target setuptools-based packages
@@ -72,7 +72,7 @@
HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
PATH=$(BR_PATH)
-HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
+HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
--prefix=$(HOST_DIR)/usr
################################################################################
@@ -96,7 +96,7 @@
$(2)_ENV ?=
$(2)_BUILD_OPT ?=
-$(2)_INSTALL_OPT ?=
+$(2)_INSTALL_OPTS ?=
ifndef $(2)_SETUP_TYPE
ifdef $(3)_SETUP_TYPE
@@ -118,7 +118,7 @@
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPT =
-$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT)
+$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
endif
# Setuptools
else ifeq ($$($(2)_SETUP_TYPE),setuptools)
@@ -132,7 +132,7 @@
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPT =
-$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT)
+$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
endif
else
$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'")
@@ -241,7 +241,7 @@
(cd $$($$(PKG)_BUILDDIR)/; \
$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
$$($(2)_PYTHON_INTERPRETER) setup.py install \
- $$($$(PKG)_BASE_INSTALL_OPT) $$($$(PKG)_INSTALL_OPT))
+ $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS))
endef
endif
diff -r 9b89581eb95a -r 350c3078ccd9 package/scons/scons.mk
--- a/package/scons/scons.mk Mon Jul 28 21:28:40 2014 +0200
+++ b/package/scons/scons.mk Mon Jul 28 21:34:36 2014 +0200
@@ -12,7 +12,7 @@
HOST_SCONS_NEEDS_HOST_PYTHON = python2
-HOST_SCONS_INSTALL_OPT = \
+HOST_SCONS_INSTALL_OPTS = \
--install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION)
$(eval $(host-python-package))
diff -r 9b89581eb95a -r 350c3078ccd9 package/util-linux/util-linux.mk
--- a/package/util-linux/util-linux.mk Mon Jul 28 21:28:40 2014 +0200
+++ b/package/util-linux/util-linux.mk Mon Jul 28 21:34:36 2014 +0200
@@ -141,4 +141,4 @@
# one, so it disappears
UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
-HOST_UTIL_LINUX_INSTALL_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
next prev parent reply other threads:[~2014-07-29 21:12 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 21:12 [Buildroot] [PATCH 00 of 20] packages: rename _OPT into _OPTS Thomas De Schampheleire
2014-07-29 21:12 ` [Buildroot] [PATCH 01 of 20] pkg-generic: introduce helper function to check for a deprecated variable Thomas De Schampheleire
2014-09-14 13:50 ` Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 02 of 20] packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS Thomas De Schampheleire
2014-09-14 14:08 ` Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 03 of 20] pkg-generic: add check on deprecated variable FOO_MAKE_OPT Thomas De Schampheleire
2014-07-29 21:12 ` Thomas De Schampheleire [this message]
2014-09-14 14:11 ` [Buildroot] [PATCH 04 of 20] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 05 of 20] pkg-generic: add check on deprecated variable FOO_INSTALL_OPT Thomas De Schampheleire
2014-07-29 21:12 ` [Buildroot] [PATCH 06 of 20] packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS Thomas De Schampheleire
2014-09-14 14:30 ` Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 07 of 20] pkg-generic: add check on deprecated variable FOO_INSTALL_TARGET_OPT Thomas De Schampheleire
2014-07-29 21:12 ` [Buildroot] [PATCH 08 of 20] packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS Thomas De Schampheleire
2014-09-14 14:34 ` Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 09 of 20] pkg-generic: add check on deprecated variable FOO_INSTALL_STAGING_OPT Thomas De Schampheleire
2014-07-29 21:12 ` [Buildroot] [PATCH 10 of 20] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS Thomas De Schampheleire
2014-09-14 14:38 ` Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 11 of 20] pkg-generic: add check on deprecated variable FOO_INSTALL_HOST_OPT Thomas De Schampheleire
2014-07-29 21:12 ` [Buildroot] [PATCH 12 of 20] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS Thomas De Schampheleire
2014-09-14 14:42 ` Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 13 of 20] pkg-generic: add check on deprecated variable FOO_AUTORECONF_OPT Thomas De Schampheleire
2014-07-29 21:12 ` [Buildroot] [PATCH 14 of 20] packages: rename FOO_CONF_OPT into FOO_CONF_OPTS Thomas De Schampheleire
2014-09-14 14:48 ` Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 15 of 20] pkg-generic: add check on deprecated variable FOO_CONF_OPT Thomas De Schampheleire
2014-07-29 21:12 ` [Buildroot] [PATCH 16 of 20] packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS Thomas De Schampheleire
2014-09-14 14:50 ` Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 17 of 20] pkg-generic: add check on deprecated variable FOO_BUILD_OPT Thomas De Schampheleire
2014-07-29 21:12 ` [Buildroot] [PATCH 18 of 20] packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS Thomas De Schampheleire
2014-09-14 14:51 ` Yann E. MORIN
2014-07-29 21:12 ` [Buildroot] [PATCH 19 of 20] pkg-generic: add check on deprecated variable FOO_GETTEXTIZE_OPT Thomas De Schampheleire
2014-07-29 21:12 ` [Buildroot] [PATCH 20 of 20] packages: rename misc. occurrences of _OPT into _OPTS Thomas De Schampheleire
2014-09-14 14:56 ` Yann E. MORIN
2014-07-30 5:15 ` [Buildroot] [PATCH 00 of 20] packages: rename " Thomas De Schampheleire
2014-09-14 14:13 ` Yann E. MORIN
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=350c3078ccd9350ebbcd.1406668351@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.