diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2016-09-07 10:17:42 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 15:27:33 +0100 |
commit | 72d1435f20e47339c75ee8dcb8adecbb2bc7516b (patch) | |
tree | 672d3932703780c57f24749061559793678c61b4 /documentation | |
parent | 066ecf613f5b6614423e43fc69431784d5531655 (diff) | |
download | poky-72d1435f20e47339c75ee8dcb8adecbb2bc7516b.tar.gz |
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 <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.xml | 8 | ||||
-rw-r--r-- | documentation/ref-manual/closer-look.xml | 4 | ||||
-rw-r--r-- | documentation/ref-manual/ref-classes.xml | 12 | ||||
-rw-r--r-- | documentation/ref-manual/ref-qa-checks.xml | 3 | ||||
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 13 | ||||
-rw-r--r-- | documentation/ref-manual/ref-varlocality.xml | 6 | ||||
-rw-r--r-- | documentation/sdk-manual/sdk-extensible.xml | 18 |
7 files changed, 48 insertions, 16 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index 9b0015d2ee..74deac5452 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml | |||
@@ -2297,6 +2297,8 @@ | |||
2297 | However, you might still want to make some adjustments. | 2297 | However, you might still want to make some adjustments. |
2298 | For example, you can set | 2298 | For example, you can set |
2299 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></ulink> | 2299 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></ulink> |
2300 | or | ||
2301 | <ulink url='&YOCTO_DOCS_REF_URL;#var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></ulink> | ||
2300 | to pass any needed configure options that are specific | 2302 | to pass any needed configure options that are specific |
2301 | to the recipe.</para></listitem> | 2303 | to the recipe.</para></listitem> |
2302 | <listitem><para><emphasis>CMake:</emphasis> | 2304 | <listitem><para><emphasis>CMake:</emphasis> |
@@ -3011,8 +3013,10 @@ | |||
3011 | You do not need to add a <filename>do_compile</filename> step since by default BitBake | 3013 | You do not need to add a <filename>do_compile</filename> step since by default BitBake |
3012 | starts the <filename>make</filename> command to compile the application. | 3014 | starts the <filename>make</filename> command to compile the application. |
3013 | If you need additional <filename>make</filename> options, you should store them in the | 3015 | If you need additional <filename>make</filename> options, you should store them in the |
3014 | <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OEMAKE'>EXTRA_OEMAKE</ulink></filename> | 3016 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OEMAKE'><filename>EXTRA_OEMAKE</filename></ulink> |
3015 | variable. | 3017 | or |
3018 | <ulink url='&YOCTO_DOCS_REF_URL;#var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></ulink> | ||
3019 | variables. | ||
3016 | BitBake passes these options into the GNU <filename>make</filename> invocation. | 3020 | BitBake passes these options into the GNU <filename>make</filename> invocation. |
3017 | Note that a <filename>do_install</filename> task is still required. | 3021 | Note that a <filename>do_install</filename> task is still required. |
3018 | Otherwise, BitBake runs an empty <filename>do_install</filename> task by default. | 3022 | Otherwise, BitBake runs an empty <filename>do_install</filename> task by default. |
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 @@ | |||
888 | class, | 888 | class, |
889 | you can add additional configuration options by using | 889 | you can add additional configuration options by using |
890 | the <link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link> | 890 | the <link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link> |
891 | variable. | 891 | or |
892 | <link linkend='var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></link> | ||
893 | variables. | ||
892 | For information on how this variable works within | 894 | For information on how this variable works within |
893 | that class, see the | 895 | that class, see the |
894 | <filename>meta/classes/autotools.bbclass</filename> file. | 896 | <filename>meta/classes/autotools.bbclass</filename> 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 @@ | |||
161 | cross-compilation. | 161 | cross-compilation. |
162 | You can pass additional parameters to | 162 | You can pass additional parameters to |
163 | <filename>configure</filename> through the | 163 | <filename>configure</filename> through the |
164 | <filename><link linkend='var-EXTRA_OECONF'>EXTRA_OECONF</link></filename> variable. | 164 | <filename><link linkend='var-EXTRA_OECONF'>EXTRA_OECONF</link></filename> |
165 | or | ||
166 | <link linkend='var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></link> | ||
167 | variables. | ||
165 | </para></listitem> | 168 | </para></listitem> |
166 | <listitem><para><link linkend='ref-tasks-compile'><filename>do_compile</filename></link> - | 169 | <listitem><para><link linkend='ref-tasks-compile'><filename>do_compile</filename></link> - |
167 | Runs <filename>make</filename> with arguments that specify the | 170 | Runs <filename>make</filename> with arguments that specify the |
168 | compiler and linker. | 171 | compiler and linker. |
169 | You can pass additional arguments through | 172 | You can pass additional arguments through |
170 | the <filename><link linkend='var-EXTRA_OEMAKE'>EXTRA_OEMAKE</link></filename> variable. | 173 | the <filename><link linkend='var-EXTRA_OEMAKE'>EXTRA_OEMAKE</link></filename> |
174 | variable. | ||
171 | </para></listitem> | 175 | </para></listitem> |
172 | <listitem><para><link linkend='ref-tasks-install'><filename>do_install</filename></link> - | 176 | <listitem><para><link linkend='ref-tasks-install'><filename>do_install</filename></link> - |
173 | Runs <filename>make install</filename> and passes in | 177 | Runs <filename>make install</filename> and passes in |
@@ -3726,7 +3730,9 @@ | |||
3726 | software that uses the Waf build system. | 3730 | software that uses the Waf build system. |
3727 | You can use the | 3731 | You can use the |
3728 | <link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link> | 3732 | <link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link> |
3729 | variable to specify additional configuration options to be passed on | 3733 | or |
3734 | <link linkend='var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></link> | ||
3735 | variables to specify additional configuration options to be passed on | ||
3730 | the Waf command line. | 3736 | the Waf command line. |
3731 | </para> | 3737 | </para> |
3732 | </section> | 3738 | </section> |
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. | |||
918 | and the upstream change log or release notes. | 918 | and the upstream change log or release notes. |
919 | Once you have worked out what the appropriate | 919 | Once you have worked out what the appropriate |
920 | change is, you can update | 920 | change is, you can update |
921 | <link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link> | 921 | <link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link>, |
922 | <link linkend='var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></link>, | ||
922 | or the individual | 923 | or the individual |
923 | <link linkend='var-PACKAGECONFIG'><filename>PACKAGECONFIG</filename></link> | 924 | <link linkend='var-PACKAGECONFIG'><filename>PACKAGECONFIG</filename></link> |
924 | option values accordingly. | 925 | 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 @@ | |||
4037 | <para role="glossdeffirst"> | 4037 | <para role="glossdeffirst"> |
4038 | <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> | 4038 | <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> |
4039 | Additional <filename>configure</filename> script options. | 4039 | Additional <filename>configure</filename> script options. |
4040 | See | ||
4041 | <link linkend='var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></link> | ||
4042 | for additional information on passing configure script | ||
4043 | options. | ||
4040 | </para> | 4044 | </para> |
4041 | </glossdef> | 4045 | </glossdef> |
4042 | </glossentry> | 4046 | </glossentry> |
@@ -9112,10 +9116,13 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
9112 | <listitem><para>Extra arguments | 9116 | <listitem><para>Extra arguments |
9113 | that should be added to the configure script | 9117 | that should be added to the configure script |
9114 | argument list | 9118 | argument list |
9115 | (<link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link>) | 9119 | (<link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link> |
9120 | or | ||
9121 | <link linkend='var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></link>) | ||
9116 | if the feature is enabled.</para></listitem> | 9122 | if the feature is enabled.</para></listitem> |
9117 | <listitem><para>Extra arguments | 9123 | <listitem><para>Extra arguments |
9118 | that should be added to <filename>EXTRA_OECONF</filename> | 9124 | that should be added to <filename>EXTRA_OECONF</filename> |
9125 | or <filename>PACKAGECONFIG_CONFARGS</filename> | ||
9119 | if the feature is disabled. | 9126 | if the feature is disabled. |
9120 | </para></listitem> | 9127 | </para></listitem> |
9121 | <listitem><para>Additional build dependencies | 9128 | <listitem><para>Additional build dependencies |
@@ -14817,7 +14824,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
14817 | task. | 14824 | task. |
14818 | Normally, invalid configure options are simply not passed | 14825 | Normally, invalid configure options are simply not passed |
14819 | to the configure script (e.g. should be removed from | 14826 | to the configure script (e.g. should be removed from |
14820 | <link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link>). | 14827 | <link linkend='var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></link> |
14828 | or | ||
14829 | <link linkend='var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></link>). | ||
14821 | However, common options, for example, exist that are passed | 14830 | However, common options, for example, exist that are passed |
14822 | to all configure scripts at a class level that might not | 14831 | to all configure scripts at a class level that might not |
14823 | be valid for some configure scripts. | 14832 | 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 @@ | |||
176 | <para> | 176 | <para> |
177 | This section lists variables that define extra build information for recipes. | 177 | This section lists variables that define extra build information for recipes. |
178 | <itemizedlist> | 178 | <itemizedlist> |
179 | <listitem><para><filename><link linkend='var-DEFAULT_PREFERENCE'>DEFAULT_PREFERENCE | ||
180 | </link></filename></para></listitem> | ||
179 | <listitem><para><filename><link linkend='var-EXTRA_OECMAKE'>EXTRA_OECMAKE</link> | 181 | <listitem><para><filename><link linkend='var-EXTRA_OECMAKE'>EXTRA_OECMAKE</link> |
180 | </filename></para></listitem> | 182 | </filename></para></listitem> |
181 | <listitem><para><filename><link linkend='var-EXTRA_OECONF'>EXTRA_OECONF</link> | 183 | <listitem><para><filename><link linkend='var-EXTRA_OECONF'>EXTRA_OECONF</link> |
182 | </filename></para></listitem> | 184 | </filename></para></listitem> |
183 | <listitem><para><filename><link linkend='var-EXTRA_OEMAKE'>EXTRA_OEMAKE</link> | 185 | <listitem><para><filename><link linkend='var-EXTRA_OEMAKE'>EXTRA_OEMAKE</link> |
184 | </filename></para></listitem> | 186 | </filename></para></listitem> |
187 | <listitem><para><filename><link linkend='var-PACKAGECONFIG_CONFARGS'>PACKAGECONFIG_CONFARGS</link> | ||
188 | </filename></para></listitem> | ||
185 | <listitem><para><filename><link linkend='var-PACKAGES'>PACKAGES</link></filename> | 189 | <listitem><para><filename><link linkend='var-PACKAGES'>PACKAGES</link></filename> |
186 | </para></listitem> | 190 | </para></listitem> |
187 | <listitem><para><filename><link linkend='var-DEFAULT_PREFERENCE'>DEFAULT_PREFERENCE | ||
188 | </link></filename></para></listitem> | ||
189 | </itemizedlist> | 191 | </itemizedlist> |
190 | </para> | 192 | </para> |
191 | </section> | 193 | </section> |
diff --git a/documentation/sdk-manual/sdk-extensible.xml b/documentation/sdk-manual/sdk-extensible.xml index c2360e9f37..86f1e28fc9 100644 --- a/documentation/sdk-manual/sdk-extensible.xml +++ b/documentation/sdk-manual/sdk-extensible.xml | |||
@@ -849,7 +849,10 @@ | |||
849 | To force the value on the command line, add the | 849 | To force the value on the command line, add the |
850 | variable setting to | 850 | variable setting to |
851 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OEMAKE'><filename>EXTRA_OEMAKE</filename></ulink> | 851 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OEMAKE'><filename>EXTRA_OEMAKE</filename></ulink> |
852 | within the recipe as follows: | 852 | or |
853 | <ulink url='&YOCTO_DOCS_REF_URL;#var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></ulink> | ||
854 | within the recipe. | ||
855 | Here is an example using <filename>EXTRA_OEMAKE</filename>: | ||
853 | <literallayout class='monospaced'> | 856 | <literallayout class='monospaced'> |
854 | EXTRA_OEMAKE += "'CC=${CC}' 'CXX=${CXX}'" | 857 | EXTRA_OEMAKE += "'CC=${CC}' 'CXX=${CXX}'" |
855 | </literallayout> | 858 | </literallayout> |
@@ -1062,9 +1065,12 @@ | |||
1062 | then a fixed set of arguments is passed to it to enable | 1065 | then a fixed set of arguments is passed to it to enable |
1063 | cross-compilation plus any extras specified by | 1066 | cross-compilation plus any extras specified by |
1064 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></ulink> | 1067 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OECONF'><filename>EXTRA_OECONF</filename></ulink> |
1068 | or | ||
1069 | <ulink url='&YOCTO_DOCS_REF_URL;#var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></ulink> | ||
1065 | set within the recipe. | 1070 | set within the recipe. |
1066 | If you wish to pass additional options, add them to | 1071 | If you wish to pass additional options, add them to |
1067 | <filename>EXTRA_OECONF</filename>. | 1072 | <filename>EXTRA_OECONF</filename> or |
1073 | <filename>PACKAGECONFIG_CONFARGS</filename>. | ||
1068 | Other supported build tools have similar variables | 1074 | Other supported build tools have similar variables |
1069 | (e.g. | 1075 | (e.g. |
1070 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OECMAKE'><filename>EXTRA_OECMAKE</filename></ulink> | 1076 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OECMAKE'><filename>EXTRA_OECMAKE</filename></ulink> |
@@ -1072,8 +1078,9 @@ | |||
1072 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OESCONS'><filename>EXTRA_OESCONS</filename></ulink> | 1078 | <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_OESCONS'><filename>EXTRA_OESCONS</filename></ulink> |
1073 | for Scons, and so forth). | 1079 | for Scons, and so forth). |
1074 | If you need to pass anything on the <filename>make</filename> | 1080 | If you need to pass anything on the <filename>make</filename> |
1075 | command line, you can use <filename>EXTRA_OEMAKE</filename> to do | 1081 | command line, you can use <filename>EXTRA_OEMAKE</filename> or the |
1076 | so. | 1082 | <ulink url='&YOCTO_DOCS_REF_URL;#var-PACKAGECONFIG_CONFARGS'><filename>PACKAGECONFIG_CONFARGS</filename></ulink> |
1083 | variables to do so. | ||
1077 | </para> | 1084 | </para> |
1078 | 1085 | ||
1079 | <para> | 1086 | <para> |
@@ -1081,7 +1088,8 @@ | |||
1081 | to help you set the arguments listed in the previous paragraph. | 1088 | to help you set the arguments listed in the previous paragraph. |
1082 | The command determines the exact options being passed, and shows | 1089 | The command determines the exact options being passed, and shows |
1083 | them to you along with any custom arguments specified through | 1090 | them to you along with any custom arguments specified through |
1084 | <filename>EXTRA_OECONF</filename>. | 1091 | <filename>EXTRA_OECONF</filename> or |
1092 | <filename>PACKAGECONFIG_CONFARGS</filename>. | ||
1085 | If applicable, the command also shows you the output of the | 1093 | If applicable, the command also shows you the output of the |
1086 | configure script's "‐‐help" option as a reference. | 1094 | configure script's "‐‐help" option as a reference. |
1087 | </para> | 1095 | </para> |