[SM-Commit] PERFORCE change 76779 by Andrew Stitt for review

Perforce Review Daemon p4review at smee.org
Sat Mar 25 16:35:54 EST 2006


Change 76779 by andrew_stitt at afk-courier on 2006/03/25 21:30:34

	fix bug 10546

Affected files ...

... //sgl/sorcery/devel/ChangeLog#535 edit
... //sgl/sorcery/devel/usr/sbin/cast#71 edit
... //sgl/sorcery/devel/var/lib/sorcery/modules/libsorcery#65 edit

Differences ...

==== //sgl/sorcery/devel/ChangeLog#535 (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/devel/usr/sbin/cast#71 (xtext) ====

@@ -289,10 +289,21 @@
   test -e $spell_sub_depends && 
   local PROCESSED_SUB_DEPENDS=$(cut -f3 -d: $spell_sub_depends|tr '\n' ' ')
   
+  # 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/devel/var/lib/sorcery/modules/libsorcery#65 (xtext) ====

@@ -644,7 +644,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
@@ -702,7 +702,6 @@
     export CXXFLAGS=$(echo $CFLAGS $CUSTOM_CXXFLAGS $OVERRIDE_CXXFLAGS $USER_SPELL_CXXFLAGS)
     export LDFLAGS=$(echo $LDFLAGS $CUSTOM_LDFLAGS $OVERRIDE_LDLAGS $USER_SPELL_LDFLAGS)
   fi
-  export LC_ALL="C"
 
 }
 



More information about the SM-Commit mailing list