packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_BUILD_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_BUILD_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/docs/manual/adding-packages-luarocks.txt b/docs/manual/adding-packages-luarocks.txt
index 10137a8ef6e15cdece5179c79414991465065bba..c914238f0bf04101a62ce47bb72b8aeb469e6776 100644 (file)
--- a/docs/manual/adding-packages-luarocks.txt
+++ b/docs/manual/adding-packages-luarocks.txt
@@ -20,8 +20,8 @@ with an example :
 07: LUAFOO_VERSION = 1.0.2-1
 08: LUAFOO_DEPENDENCIES = foo
 09:
-10: LUAFOO_BUILD_OPT += FOO_INCDIR=$(STAGING_DIR)/usr/include
-11: LUAFOO_BUILD_OPT += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
+10: LUAFOO_BUILD_OPTS += FOO_INCDIR=$(STAGING_DIR)/usr/include
+11: LUAFOO_BUILD_OPTS += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
 12: LUAFOO_LICENSE = luaFoo license
 13: LUAFOO_LICENSE_FILES = COPYING
 14:
@@ -86,5 +86,5 @@ also defined. They can be overridden in specific cases.
 * +LUAFOO_SUBDIR+, which defaults to
   +luafoo-$(LUAFOO_VERSION_WITHOUT_ROCKSPEC_REVISION)+
 
-* +LUAFOO_BUILD_OPT+ contains additional build options for the
+* +LUAFOO_BUILD_OPTS+ contains additional build options for the
   +luarocks build+ call.

diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
index 6c44f98afb791e2b20889901ec7f20dd3f4866bb..63fafe65588dc0c5272aa587ad81225f68d49257 100644 (file)
--- a/docs/manual/adding-packages-perl.txt
+++ b/docs/manual/adding-packages-perl.txt
@@ -105,7 +105,7 @@ cases, typical packages will therefore only use a few of them.
   configure options to pass to the +perl Makefile.PL+ or +perl Build.PL+.
   By default, empty.
 
-* +PERL_FOO_BUILD_OPT+/+HOST_PERL_FOO_BUILD_OPT+, to specify additional
+* +PERL_FOO_BUILD_OPTS+/+HOST_PERL_FOO_BUILD_OPTS+, to specify additional
   options to pass to +make pure_all+ or +perl Build build+ in the build step.
   By default, empty.
 

diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
index bca0f6a62e2462ca9342f0c8be801532797ae8b0..3cbb87d069162883ddb66f88e85a663c0a3d2f80 100644 (file)
--- a/docs/manual/adding-packages-python.txt
+++ b/docs/manual/adding-packages-python.txt
@@ -122,9 +122,9 @@ therefore only use a few of them, or none.
   setuptools target packages) and +HOST_PKG_PYTHON_SETUPTOOLS_ENV+
   (for setuptools host packages).
 
-* +PYTHON_FOO_BUILD_OPT+, to specify additional options to pass to the
+* +PYTHON_FOO_BUILD_OPTS+, to specify additional options to pass to the
   Python +setup.py+ script during the build step. For target distutils
-  packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
+  packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPTS+ options are already
   passed automatically by the infrastructure.
 
 * +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+,

diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
index 95b397c9f9a8c59a47e1ab010ee9797426bde7ba..f0fb73d0aa9190ce2e379e0fd4a6b8845d6719a4 100644 (file)
--- a/package/pkg-luarocks.mk
+++ b/package/pkg-luarocks.mk
@@ -33,7 +33,7 @@
 
 define inner-luarocks-package
 
-$(2)_BUILD_OPT         ?=
+$(2)_BUILD_OPTS                ?=
 $(2)_SUBDIR            ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
 $(2)_ROCKSPEC          ?= $(1)-$$($(3)_VERSION).rockspec
 $(2)_SOURCE            ?= $(1)-$$($(3)_VERSION).src.rock
@@ -59,7 +59,7 @@ endif
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
        cd $$($(2)_SRCDIR) && \
-        $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPT)
+        $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS)
 endef
 endif
 

diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
index 8ebfce535af8abe5aa3f8817af450cf3d378167e..7abafc35aefd6bc5436211db78b9f31bcec89639 100644 (file)
--- a/package/pkg-perl.mk
+++ b/package/pkg-perl.mk
@@ -129,11 +129,11 @@ ifeq ($(4),target)
 # Build package for target
 define $(2)_BUILD_CMDS
        cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
-               perl Build $$($(2)_BUILD_OPT) build; \
+               perl Build $$($(2)_BUILD_OPTS) build; \
        else \
                $$(MAKE1) \
                        PERL_INC=$$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \
-                       $$($(2)_BUILD_OPT) pure_all; \
+                       $$($(2)_BUILD_OPTS) pure_all; \
        fi
 endef
 else
@@ -141,9 +141,9 @@ else
 # Build package for host
 define $(2)_BUILD_CMDS
        cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
-               perl Build $$($(2)_BUILD_OPT) build; \
+               perl Build $$($(2)_BUILD_OPTS) build; \
        else \
-               $$(MAKE1) $$($(2)_BUILD_OPT) pure_all; \
+               $$(MAKE1) $$($(2)_BUILD_OPTS) pure_all; \
        fi
 endef
 endif

diff --git a/package/pkg-python.mk b/package/pkg-python.mk
index af17f7f6d9dbbd4dfab1a9762258ce8e0604930e..426301af9a72fd229f06c3ea87ebfd0ec378eddd 100644 (file)
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -32,7 +32,7 @@ PKG_PYTHON_DISTUTILS_ENV = \
        _python_prefix=/usr \
        _python_exec_prefix=/usr
 
-PKG_PYTHON_DISTUTILS_BUILD_OPT = \
+PKG_PYTHON_DISTUTILS_BUILD_OPTS = \
        --executable=/usr/bin/python
 
 PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
@@ -95,7 +95,7 @@ $(2)_SRCDIR   = $$($(2)_DIR)/$$($(2)_SUBDIR)
 $(2)_BUILDDIR  = $$($(2)_SRCDIR)
 
 $(2)_ENV         ?=
-$(2)_BUILD_OPT   ?=
+$(2)_BUILD_OPTS   ?=
 $(2)_INSTALL_OPTS ?=
 
 ifndef $(2)_SETUP_TYPE
@@ -111,13 +111,13 @@ ifeq ($$($(2)_SETUP_TYPE),distutils)
 ifeq ($(4),target)
 $(2)_BASE_ENV         = $$(PKG_PYTHON_DISTUTILS_ENV)
 $(2)_BASE_BUILD_TGT   = build
-$(2)_BASE_BUILD_OPT   = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
+$(2)_BASE_BUILD_OPTS   = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
 $(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
 $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
 else
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
 $(2)_BASE_BUILD_TGT   = build
-$(2)_BASE_BUILD_OPT   =
+$(2)_BASE_BUILD_OPTS   =
 $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
 endif
 # Setuptools
@@ -125,13 +125,13 @@ else ifeq ($$($(2)_SETUP_TYPE),setuptools)
 ifeq ($(4),target)
 $(2)_BASE_ENV         = $$(PKG_PYTHON_SETUPTOOLS_ENV)
 $(2)_BASE_BUILD_TGT   = build
-$(2)_BASE_BUILD_OPT   =
+$(2)_BASE_BUILD_OPTS   =
 $(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
 $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
 else
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
 $(2)_BASE_BUILD_TGT   = build
-$(2)_BASE_BUILD_OPT   =
+$(2)_BASE_BUILD_OPTS   =
 $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
 endif
 else
@@ -228,7 +228,7 @@ define $(2)_BUILD_CMDS
                $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
                $$($(2)_PYTHON_INTERPRETER) setup.py \
                $$($$(PKG)_BASE_BUILD_TGT) \
-               $$($$(PKG)_BASE_BUILD_OPT) $$($$(PKG)_BUILD_OPT))
+               $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS))
 endef
 endif
 

diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk
index 3d3a6c52d0325b046957e86f4f14161af4398404..0ab58b0000354746977a97ba7cd0fc1a4532b34a 100644 (file)
--- a/package/python-numpy/python-numpy.mk
+++ b/package/python-numpy/python-numpy.mk
@@ -16,7 +16,7 @@ PYTHON_NUMPY_DEPENDENCIES += clapack
 PYTHON_NUMPY_SITE_CFG_LIBS += blas lapack
 endif
 
-PYTHON_NUMPY_BUILD_OPT = --fcompiler=None
+PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None
 
 define PYTHON_NUMPY_CONFIGURE_CMDS
        -rm -f $(@D)/site.cfg