[Buildroot] [PATCH 06 of 15] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
Yann E. MORIN
yann.morin.1998 at free.fr
Sat Sep 27 22:17:02 UTC 2014
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_AUTORECONF_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_AUTORECONF_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Casual inspection, plus:
git difftool -y -x 'diff -du -I "_AUTORECONF_OPTS\?\>"' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
> docs/manual/adding-packages-autotools.txt | 2 +-
> package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk | 2 +-
> package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +-
> package/pkg-autotools.mk | 4 ++--
> package/webkit/webkit.mk | 2 +-
> 5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
> --- a/docs/manual/adding-packages-autotools.txt
> +++ b/docs/manual/adding-packages-autotools.txt
> @@ -126,7 +126,7 @@
> +LIBFOO_AUTORECONF=YES+. These are passed in the environment of
> the 'autoreconf' command. By default, empty.
>
> -* +LIBFOO_AUTORECONF_OPT+ to specify additional options
> +* +LIBFOO_AUTORECONF_OPTS+ to specify additional options
> passed to the 'autoreconf' program if
> +LIBFOO_AUTORECONF=YES+. By default, empty.
>
> diff --git a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
> --- a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
> +++ b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
> @@ -12,7 +12,7 @@
>
> # There is no generated configure script in the tarball.
> GST_PLUGIN_X170_AUTORECONF = YES
> -GST_PLUGIN_X170_AUTORECONF_OPT = -Im4/
> +GST_PLUGIN_X170_AUTORECONF_OPTS = -Im4/
> GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs
>
> $(eval $(autotools-package))
> diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> @@ -13,7 +13,7 @@
> GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+
>
> GST1_PLUGINS_BAD_AUTORECONF = YES
> -GST1_PLUGINS_BAD_AUTORECONF_OPT = -I $(@D)/common/m4
> +GST1_PLUGINS_BAD_AUTORECONF_OPTS = -I $(@D)/common/m4
> GST1_PLUGINS_BAD_GETTEXTIZE = YES
>
> GST1_PLUGINS_BAD_CONF_OPT = \
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -100,7 +100,7 @@
> endif
>
> ifeq ($(4),host)
> - $(2)_AUTORECONF_OPT ?= $$($(3)_AUTORECONF_OPT)
> + $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS)
> endif
>
> $(2)_CONF_ENV ?=
> @@ -228,7 +228,7 @@
> #
> define AUTORECONF_HOOK
> @$$(call MESSAGE,"Autoreconfiguring")
> - $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
> + $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPTS)
> $$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
> for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
> ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
> diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
> --- a/package/webkit/webkit.mk
> +++ b/package/webkit/webkit.mk
> @@ -17,7 +17,7 @@
>
> # webkit-disable-tests.patch changes configure.ac therefore autoreconf required
> WEBKIT_AUTORECONF = YES
> -WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
> +WEBKIT_AUTORECONF_OPTS = -I $(@D)/Source/autotools
>
> # parallel make install deadlocks with make 3.81
> WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list