Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3fd574c7a86894b1c963f8589d1d0b9632f3497e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3fd574c7a86894b1c963f8589d1d0b9632f3497e)
  • Date: Thu, 23 Apr 2015 02:51:19 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

ChangeLog | 1 +
FUNCTIONS | 16 +++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 3fd574c7a86894b1c963f8589d1d0b9632f3497e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

FUNCTIONS: more robust waf_build

diff --git a/ChangeLog b/ChangeLog
index 8b75ff9..0b91622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
* utils/numactl: new spell, NUMA support
+ * FUNCTIONS: make waf_build more robust with differing versions of waf

2015-04-22 Vlad Glagolev <stealth AT sourcemage.org>
* FUNCTIONS: fixed check_tmp_noexec for tmp-less systems, do not force
diff --git a/FUNCTIONS b/FUNCTIONS
index 179b05a..5a9d3c5 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -508,12 +508,22 @@ function note_config_files() {
# please use this one instead of maunaly calling waf when possible
# Disabled caching as this has GREAT potential for borkage
# and waf is fast without it as well
+# The waf disables options between versions and bails out if they are given,
+# so check first if they are supported..

function waf_build() {
- ./waf configure --prefix=${INSTALL_ROOT}/usr \
- --mandir=${INSTALL_ROOT}/usr/share/man \
+ local waf_opts="--prefix=$INSTALL_ROOT/usr"
+ # Some waf not know man, waf angry with man.
+ if ./waf --help | grep -q -- --mandir; then
+ waf_opts="$waf_opts --mandir=$INSTALL_ROOT/usr/share/man"
+ fi
+ # Same with some other options.
+ if ./waf --help | grep -q -- --nocache; then
+ waf_opts="$waf_opts --nocache"
+ fi
+ ./waf configure $waf_opts \
-j $MAKE_NJOBS \
- --nocache $OPTS &&
+ $OPTS &&
./waf build
}




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3fd574c7a86894b1c963f8589d1d0b9632f3497e), Thomas Orgis, 04/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page