Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by David Brown (e38c6b5cbbe956696af0fcbf4e7efd894b2cfbee)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by David Brown (e38c6b5cbbe956696af0fcbf4e7efd894b2cfbee)
  • Date: Sat, 24 Feb 2007 13:53:20 -0600

GIT changes to master sorcery by David Brown <dmlb2000 AT gmail.com>:

ChangeLog | 5 +++++
etc/sorcery/compile_config | 1 -
usr/sbin/cast | 2 ++
var/lib/sorcery/build/run_compiler | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e38c6b5cbbe956696af0fcbf4e7efd894b2cfbee
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed bug 13411 making sure DISTCC_DIR is set properly and making sure it
exists so that it doesn't get tracked

diff --git a/ChangeLog b/ChangeLog
index b839df0..fa1858e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-24 David Brown <dmlb2000 AT gmail.com>
+ * cast: added DISTCC_DIR before run_build_spell
+ * compile_config: removed DISTCC_DIR
+ * run_compiler: check to make sure DISTCC_DIR exists then make it if
not
+
2007-02-19 Andrew Stitt <astitt AT sourcemage.org>
* select_list: update documentation and mangle variable names, bug
13458

diff --git a/etc/sorcery/compile_config b/etc/sorcery/compile_config
index 9643e71..d9b5785 100644
--- a/etc/sorcery/compile_config
+++ b/etc/sorcery/compile_config
@@ -3,7 +3,6 @@
CCACHE=${CCACHE:-off}
CCACHE_DIR=${CCACHE_DIR:-/var/cache/compiler}
DISTCC_HOSTS=${DISTCC_HOSTS:-""}
- DISTCC_DIR=${DISTCC_DIR:-"$SOURCE_DIRECTORY/.distcc"}
JOBS_PER_HOST=${JOBS_PER_HOST:-0}
MAKE_NJOBS=${MAKE_NJOBS:-1}
RUN_COMPILER_DIR=/var/lib/sorcery/build
diff --git a/usr/sbin/cast b/usr/sbin/cast
index 37f97be..1a56819 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -262,6 +262,8 @@ function cast_spell() { (
local saved_lc_all=$LC_ALL
export LC_ALL=C

+ DISTCC_DIR="$SOURCE_DIRECTORY/.distcc"
+
# this will run through the whole build process
run_build_spell
rc=$?
diff --git a/var/lib/sorcery/build/run_compiler
b/var/lib/sorcery/build/run_compiler
index 9733720..b6a0edf 100644
--- a/var/lib/sorcery/build/run_compiler
+++ b/var/lib/sorcery/build/run_compiler
@@ -29,6 +29,8 @@ if [[ $USE_DISTCC != off ]] &&
export DISTCC_DIR
export DISTCC_VERBOSE=0
export DISTCC_LOG=/dev/null
+
+ test -d "$DISTCC_DIR" || mkdir -p "$DISTCC_DIR"
else
DISTCC=""
fi



  • [SM-Commit] GIT changes to master sorcery by David Brown (e38c6b5cbbe956696af0fcbf4e7efd894b2cfbee), David Brown, 02/24/2007

Archive powered by MHonArc 2.6.24.

Top of Page