From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 02 of 15] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
Date: Sun, 28 Sep 2014 00:05:48 +0200 [thread overview]
Message-ID: <20140927220548.GK4298@free.fr> (raw)
In-Reply-To: <a386300f095aa56038f1.1411846359@localhost>
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_INSTALL_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_INSTALL_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Casual visual review, plus:
git difftool -y -x 'diff -du -I "_INSTALL_OPTS\?\>"' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
> docs/manual/adding-packages-perl.txt | 2 +-
> docs/manual/adding-packages-python.txt | 6 +++---
> package/gcc/gcc-initial/gcc-initial.mk | 2 +-
> package/pkg-autotools.mk | 4 ++--
> package/pkg-python.mk | 12 ++++++------
> package/scons/scons.mk | 2 +-
> package/util-linux/util-linux.mk | 2 +-
> 7 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
> --- a/docs/manual/adding-packages-perl.txt
> +++ b/docs/manual/adding-packages-perl.txt
> @@ -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 --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
> --- a/docs/manual/adding-packages-python.txt
> +++ b/docs/manual/adding-packages-python.txt
> @@ -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 --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
> --- a/package/gcc/gcc-initial/gcc-initial.mk
> +++ b/package/gcc/gcc-initial/gcc-initial.mk
> @@ -54,6 +54,6 @@
> # support, as it can't guess it since the C library hasn't been built
> # yet (we're gcc-initial).
> HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
> -HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
> +HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc
>
> $(eval $(host-autotools-package))
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -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
>
> @@ -285,7 +285,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 --git a/package/pkg-python.mk b/package/pkg-python.mk
> --- a/package/pkg-python.mk
> +++ b/package/pkg-python.mk
> @@ -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 --git a/package/scons/scons.mk b/package/scons/scons.mk
> --- a/package/scons/scons.mk
> +++ b/package/scons/scons.mk
> @@ -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 --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -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
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2014-09-27 22:05 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
2014-09-27 19:32 ` [Buildroot] [PATCH 01 of 15] packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS Thomas De Schampheleire
2014-09-27 22:04 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 02 of 15] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS Thomas De Schampheleire
2014-09-27 22:05 ` Yann E. MORIN [this message]
2014-09-27 22:07 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 03 of 15] packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS Thomas De Schampheleire
2014-09-27 22:06 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 04 of 15] packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS Thomas De Schampheleire
2014-09-27 22:08 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS Thomas De Schampheleire
2014-09-27 22:15 ` Yann E. MORIN
2014-10-04 16:52 ` Thomas Petazzoni
2014-10-04 17:07 ` Samuel Martin
2014-10-04 17:13 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 06 of 15] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS Thomas De Schampheleire
2014-09-27 22:17 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 07 of 15] packages: rename FOO_CONF_OPT into FOO_CONF_OPTS Thomas De Schampheleire
2014-09-27 22:18 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 08 of 15] packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS Thomas De Schampheleire
2014-09-27 22:20 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 09 of 15] packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS Thomas De Schampheleire
2014-09-27 22:26 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 10 of 15] packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS Thomas De Schampheleire
2014-09-27 22:29 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 11 of 15] pkg-generic: introduce helper function to check for a deprecated variable Thomas De Schampheleire
2014-10-04 17:13 ` Thomas Petazzoni
2014-09-27 19:32 ` [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT Thomas De Schampheleire
2014-09-27 21:49 ` Yann E. MORIN
2014-10-04 17:14 ` Thomas Petazzoni
2014-10-04 22:15 ` Yann E. MORIN
2014-10-05 7:34 ` Thomas De Schampheleire
2014-10-05 7:54 ` Thomas Petazzoni
2014-10-05 7:58 ` Thomas De Schampheleire
2014-09-27 19:32 ` [Buildroot] [PATCH 13 of 15] packages: rename misc. occurrences of _OPT into _OPTS Thomas De Schampheleire
2014-09-27 22:35 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 14 of 15] .mk files: remove alignment of line continuation characters Thomas De Schampheleire
2014-09-28 12:10 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 15 of 15] .mk files: remove alignment of assignments Thomas De Schampheleire
2014-09-28 12:12 ` Yann E. MORIN
2014-09-27 21:15 ` [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Yann E. MORIN
2014-10-04 17:07 ` Thomas Petazzoni
2014-10-05 9:17 ` Yann E. MORIN
2014-10-05 11:07 ` Thomas Petazzoni
2014-10-05 12:22 ` Thomas De Schampheleire
2014-10-05 12:30 ` Thomas Petazzoni
2014-10-05 12:31 ` Thomas De Schampheleire
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=20140927220548.GK4298@free.fr \
--to=yann.morin.1998@free.fr \
--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