From 72d1435f20e47339c75ee8dcb8adecbb2bc7516b Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Wed, 7 Sep 2016 10:17:42 -0700 Subject: documentation: Added new description for the PACKAGECONFIG_CONFARGS variable. Fixes [YOCTO #10183] Added a new variable entry for the PACKAGECONFIG_CONFARGS variable. With the introduction of the new PACKAGECONFIG_CONFARGS variable, many places in the mainstream YP documentation that referenced how to pass configure arguments using EXTRA_OECONF needed to also make mention of this new variable. I added many cross-references to the new variable. (From yocto-docs rev: 00f02d45319bab90b72eab89fcb69cbe8bd05bb5) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/ref-manual/closer-look.xml | 4 +++- documentation/ref-manual/ref-classes.xml | 12 +++++++++--- documentation/ref-manual/ref-qa-checks.xml | 3 ++- documentation/ref-manual/ref-variables.xml | 13 +++++++++++-- documentation/ref-manual/ref-varlocality.xml | 6 ++++-- 5 files changed, 29 insertions(+), 9 deletions(-) (limited to 'documentation/ref-manual') diff --git a/documentation/ref-manual/closer-look.xml b/documentation/ref-manual/closer-look.xml index 825409f5a7..a9eb1b6c7f 100644 --- a/documentation/ref-manual/closer-look.xml +++ b/documentation/ref-manual/closer-look.xml @@ -888,7 +888,9 @@ class, you can add additional configuration options by using the EXTRA_OECONF - variable. + or + PACKAGECONFIG_CONFARGS + variables. For information on how this variable works within that class, see the meta/classes/autotools.bbclass file. diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml index 98a365871d..2344a0406a 100644 --- a/documentation/ref-manual/ref-classes.xml +++ b/documentation/ref-manual/ref-classes.xml @@ -161,13 +161,17 @@ cross-compilation. You can pass additional parameters to configure through the - EXTRA_OECONF variable. + EXTRA_OECONF + or + PACKAGECONFIG_CONFARGS + variables. do_compile - Runs make with arguments that specify the compiler and linker. You can pass additional arguments through - the EXTRA_OEMAKE variable. + the EXTRA_OEMAKE + variable. do_install - Runs make install and passes in @@ -3726,7 +3730,9 @@ software that uses the Waf build system. You can use the EXTRA_OECONF - variable to specify additional configuration options to be passed on + or + PACKAGECONFIG_CONFARGS + variables to specify additional configuration options to be passed on the Waf command line. diff --git a/documentation/ref-manual/ref-qa-checks.xml b/documentation/ref-manual/ref-qa-checks.xml index 4fcf1db619..893629d698 100644 --- a/documentation/ref-manual/ref-qa-checks.xml +++ b/documentation/ref-manual/ref-qa-checks.xml @@ -918,7 +918,8 @@ can be found then it should be implemented. I can't find one at the moment. and the upstream change log or release notes. Once you have worked out what the appropriate change is, you can update - EXTRA_OECONF + EXTRA_OECONF, + PACKAGECONFIG_CONFARGS, or the individual PACKAGECONFIG option values accordingly. diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 37ca37b626..afc36a5b14 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -4037,6 +4037,10 @@ Additional configure script options. + See + PACKAGECONFIG_CONFARGS + for additional information on passing configure script + options. @@ -9112,10 +9116,13 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" Extra arguments that should be added to the configure script argument list - (EXTRA_OECONF) + (EXTRA_OECONF + or + PACKAGECONFIG_CONFARGS) if the feature is enabled. Extra arguments that should be added to EXTRA_OECONF + or PACKAGECONFIG_CONFARGS if the feature is disabled. Additional build dependencies @@ -14817,7 +14824,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" task. Normally, invalid configure options are simply not passed to the configure script (e.g. should be removed from - EXTRA_OECONF). + EXTRA_OECONF + or + PACKAGECONFIG_CONFARGS). However, common options, for example, exist that are passed to all configure scripts at a class level that might not be valid for some configure scripts. diff --git a/documentation/ref-manual/ref-varlocality.xml b/documentation/ref-manual/ref-varlocality.xml index d3f873298d..54524d5b60 100644 --- a/documentation/ref-manual/ref-varlocality.xml +++ b/documentation/ref-manual/ref-varlocality.xml @@ -176,16 +176,18 @@ This section lists variables that define extra build information for recipes. + DEFAULT_PREFERENCE + EXTRA_OECMAKE EXTRA_OECONF EXTRA_OEMAKE + PACKAGECONFIG_CONFARGS + PACKAGES - DEFAULT_PREFERENCE - -- cgit v1.2.3-54-g00ecf