Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (0d7d2ac93d088d63d031209efee3b1b75367d40b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (0d7d2ac93d088d63d031209efee3b1b75367d40b)
  • Date: Sun, 11 Jul 2010 03:05:31 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

ChangeLog | 4 ++++
FUNCTIONS | 18 ++++++++++++------
2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 0d7d2ac93d088d63d031209efee3b1b75367d40b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

FUNCTIONS: added function prepare_opts with code from
default_build_configure
now it can be used in BUILD file or in other functions instead of
OPTS="$SPELL_OPTS $OPTS"

commit daa2cbd03c1cec22b0dc7432329704f30ef60f2f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

FUNCTIONS: Fixed function default_build_configure

diff --git a/ChangeLog b/ChangeLog
index 62b7023..40997bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-11 Bor Kraljič <pyrobor AT ver.si>
+ * FUNCTIONS: Fixed function default_build_configure to get SPELL_OPTS
in OPTS
+ added function prepare_opts with code from default_build_configure
+
2010-07-11 Ladislav Hagara <hgr AT vabo.cz>
* utils/statifier: new spell
converts dynamically linked executable into static one
diff --git a/FUNCTIONS b/FUNCTIONS
index f9ad35c..5f7a089 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -663,17 +663,23 @@ function default_kde3_build() {

}

+# Move SPELL_OPTS to OPTS
+# basicly generic OPTS="$SPELL_OPTS $OPTS"
+function prepare_opts() {
+ # this is here so that config_query_option can be used without
+ # extra junk
+ local up_spell_name=$(echo $SPELL | tr "a-z" "A-Z") &&
+ local up_spell_name=$(echo $up_spell_name | tr "-" "_") &&
+ local tempopts="${up_spell_name}_OPTS" &&
+ OPTS="${!tempopts} $OPTS"
+}
+
#---
## Default configure
#---

function default_build_configure() {
- # this is here so that config_query_option can be used without
- # extra junk
- local up_spell_name=$(echo $SPELL | tr "a-z" "A-Z") &&
- local up_spell_name=$(echo $SPELL | tr "-" "_") &&
- local tempopts="${up_spell_name}_OPTS" &&
- OPTS="${!tempopts} $OPTS" &&
+ prepare_opts &&
OPTS="$OPTS --build=${BUILD}" &&
#If these switches are used, they _may_ stop distcc and ccache from working
# for some spells (bug 3798)



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (0d7d2ac93d088d63d031209efee3b1b75367d40b), Bor Kraljič, 07/11/2010

Archive powered by MHonArc 2.6.24.

Top of Page