sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] PERFORCE change 76780 by Andrew Stitt for review
- From: Perforce Review Daemon <p4review AT smee.org>
- To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
- Subject: [SM-Commit] PERFORCE change 76780 by Andrew Stitt for review
- Date: Sat, 25 Mar 2006 21:35:56 +0000 (GMT)
Change 76780 by andrew_stitt@afk-courier on 2006/03/25 21:32:18
integ fix for bug 10546
Affected files ...
... //sgl/sorcery/test/ChangeLog#182 integrate
... //sgl/sorcery/test/usr/sbin/cast#27 integrate
... //sgl/sorcery/test/var/lib/sorcery/modules/libsorcery#25 integrate
Differences ...
==== //sgl/sorcery/test/ChangeLog#182 (text) ====
@@ -1,3 +1,8 @@
+2006-03-25 Andrew Stitt <astitt AT sourcemage.org>
+ * libsorcery: remove LC_ALL hack
+ * cast: put slightly safer LC_ALL hack in cast around the build
+ phase. This fixes bug 10546, see also bug 2910.
+
2006-03-24 Andrew Stitt <astitt AT sourcemage.org>
* libdispel: explicitly return 0 after removing state files
==== //sgl/sorcery/test/usr/sbin/cast#27 (xtext) ====
@@ -244,10 +244,21 @@
test -e $spell_depends &&
OPTS="$OPTS $(get_depends_options $spell_depends $SPELL)"
+ # HACK for bug 2910 and 10546
+ local saved_lc_all=$LC_ALL
+ export LC_ALL=C
+
# this will run through the whole build process
run_build_spell
rc=$?
+ # HACK for bug 2910 and 10546
+ if [[ -n ${saved_lc_all} ]] ; then
+ export LC_ALL=$saved_lc_all
+ else
+ unset LC_ALL
+ fi
+
# This is the home for anything and everything we do
# when a phase4 succeeds or fails, no more spreading things out
# into multiple functions.
==== //sgl/sorcery/test/var/lib/sorcery/modules/libsorcery#25 (xtext) ====
@@ -651,7 +651,7 @@
function optimize() {
debug "libsorcery" "In optimize()"
- unset CFLAGS CXXFLAGS LDFLAGS LC_ALL
+ unset CFLAGS CXXFLAGS LDFLAGS
unset COMBRELOC FAST PRELINK RISKY SMALL SPEEDY STRIP TINY
# if user specified --no-opts then use only the args from the command line
@@ -709,7 +709,6 @@
export CXXFLAGS=$(echo $CFLAGS $CUSTOM_CXXFLAGS $OVERRIDE_CXXFLAGS)
export LDFLAGS=$(echo $LDFLAGS $CUSTOM_LDFLAGS $OVERRIDE_LDLAGS)
fi
- export LC_ALL="C"
}
- [SM-Commit] PERFORCE change 76780 by Andrew Stitt for review, Perforce Review Daemon, 03/25/2006
Archive powered by MHonArc 2.6.24.