[sdk/kdesrc-build/docbook_historied_per_file] doc/kdesrc-buildrc: build-systems: Mask default options for non-default build systems.

[Michael Pyne]

Git commit bca4e917547a7b1a720b18bd4598a4ac63d5eba4 by Michael Pyne.
Committed on 30/03/2014 at 03:39.
Pushed by ashark into branch 'docbook_historied_per_file'.

build-systems: Mask default options for non-default build systems.

This is a first-step hack to have non-default build systems ignore
global options which are related to the build system in use (e.g.
compile or make flags, install/uninstall options, etc.).

This should fix bug 331654 (now that I understand it better) and improve
the situation for bug 332789 (which would be the long-term fix when
implemented).

BUG:331654
CCBUG:332789
FIXED-IN:1.16

Original commit: 9fb3fb04
https://invent.kde.org/sdk/kdesrc-build/-/commit/9fb3fb04d170478c922c5d85bb996f8f4b7ed82c

M  +11   -8    doc/kdesrc-buildrc/conf-options-table.docbook

https://invent.kde.org/sdk/kdesrc-build/-/commit/bca4e917547a7b1a720b18bd4598a4ac63d5eba4

diff --git a/doc/kdesrc-buildrc/conf-options-table.docbook b/doc/kdesrc-buildrc/conf-options-table.docbook
index 9fd94b26..94c0d724 100644
--- a/doc/kdesrc-buildrc/conf-options-table.docbook
+++ b/doc/kdesrc-buildrc/conf-options-table.docbook
@@ -228,7 +228,8 @@ operation of the &git; source control system.</para>
 
 <row id="conf-cmake-options">
 <entry>cmake-options</entry>
-<entry>Appends to global options (not applicable to qt)</entry>
+<entry>Appends to global options for the default buildsystem, overrides global
+for other buildsystems.</entry>
 <entry><para>Use this option to specify what flags to pass to &cmake; when
 creating the build system for the module. When this is used as a global option,
 it is applied to all modules that this script builds. When used as a module
@@ -262,7 +263,8 @@ color codes to anything but a terminal (such as xterm, &konsole;, or the normal
 
 <row id="conf-configure-flags">
 <entry>configure-flags</entry>
-<entry>Module setting overrides global</entry>
+<entry>Appends to global options for the default buildsystem, overrides global
+for other buildsystems.</entry>
 <entry><para>Use this option to specify what flags to pass to ./configure when
 creating the build system for the module. When this is used as a global-option,
 it is applied to all modules that this script builds. <emphasis>This option
@@ -276,7 +278,7 @@ only works for qt.</emphasis></para>
 
 <row id="conf-custom-build-command">
 <entry>custom-build-command</entry>
-<entry>Module setting overrides global</entry>
+<entry>Module setting overrides global (build system option)</entry>
 <entry>
     <para>This option can be set to run a different command (other than
     <command>make</command>, for example) in order to perform the build
@@ -294,7 +296,8 @@ only works for qt.</emphasis></para>
 
 <row id="conf-cxxflags">
 <entry>cxxflags</entry>
-<entry>Appends to global option</entry>
+<entry>Appends to global options for the default buildsystem, overrides global
+for other buildsystems.</entry>
 <entry><para>Use this option to specify what flags to use for building the
 module. This option is
 specified here instead of with <link
@@ -622,7 +625,7 @@ generated by the script.
 
 <row id="conf-make-install-prefix">
 <entry>make-install-prefix</entry>
-<entry>Module setting overrides global</entry>
+<entry>Module setting overrides global (build system option)</entry>
 <entry>Set this variable to a space-separated list, which is interpreted as a
 command and its options to precede the <userinput><command>make</command> <option>install</option></userinput> command used to install
 modules. This is useful for installing packages with &sudo; for example, but
@@ -631,7 +634,7 @@ please be careful while dealing with root privileges.</entry>
 
 <row id="conf-make-options">
 <entry>make-options</entry>
-<entry>Module setting overrides global</entry>
+<entry>Module setting overrides global (build system option)</entry>
 <entry>Set this variable in order to pass command line options to the
 <command>make</command> command. This is useful for programs such as <ulink
 url="http://distcc.samba.org/"><application>distcc</application></ulink> or
@@ -860,7 +863,7 @@ linkend="kde-projects-module-sets">kde-projects</link> modules) until
 
 <row id="conf-run-tests">
 <entry>run-tests</entry>
-<entry>Module setting overrides global</entry>
+<entry>Module setting overrides global (build system option)</entry>
 <entry>If set to <userinput>true</userinput>, then the module will be
 built with support for running its test suite, and the test suite will be
 executed as part of the build process. &kdesrc-build; will show a simple
@@ -942,7 +945,7 @@ url="http://download.kde.org/download.php">its mirrors</ulink>.</para>
 
 <row id="conf-use-clean-install">
 <entry>use-clean-install</entry>
-<entry>Module setting overrides global</entry>
+<entry>Module setting overrides global (build system option)</entry>
 <entry><para>Set this option to <userinput>true</userinput> in order to
 have &kdesrc-build; run <command>make uninstall</command> directly before
 running <command>make install</command>.</para>