[SM-Commit] PERFORCE change 76783 by David Michael Leo Brown Jr. for review

Perforce Review Daemon p4review at smee.org
Sat Mar 25 16:40:11 EST 2006


Change 76783 by david_brown at dmlb2000-dmlb2004 on 2006/03/25 21:38:32

	integrated from devel

Affected files ...

... //sgl/sorcery/proj/proj1/ChangeLog#65 integrate
... //sgl/sorcery/proj/proj1/etc/sorcery/config#31 integrate
... //sgl/sorcery/proj/proj1/etc/sorcery/version#48 integrate
... //sgl/sorcery/proj/proj1/usr/sbin/cast#33 integrate
... //sgl/sorcery/proj/proj1/var/lib/sorcery/modules/libsorcery#21 integrate

Differences ...

==== //sgl/sorcery/proj/proj1/ChangeLog#65 (text) ====

@@ -1,3 +1,9 @@
+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.
+	* config: add -f to less arguments, less is never invoked on binary data
+
 2006-03-24 Andrew Stitt <astitt at sourcemage.org>
 	* libdispel: explicitly return 0 after removing state files
 

==== //sgl/sorcery/proj/proj1/etc/sorcery/config#31 (xtext) ====

@@ -52,7 +52,7 @@
                     # -X: dont do screen init and deinit, gaze install
                     # of a small spell is effectively useless otherwise as the
                     # screen is cleared afterwards.
-                PAGER=${PAGER:=less -R -E -X}
+                PAGER=${PAGER:=less -R -E -X -f}
              FILEPROG=${FILEPROG:=file}
            DIALOGPROG=${DIALOGPROG:=dialog}
 

==== //sgl/sorcery/proj/proj1/etc/sorcery/version#48 (text) ====

@@ -1,1 +1,1 @@
-20060323
+20060324

==== //sgl/sorcery/proj/proj1/usr/sbin/cast#33 (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/proj/proj1/var/lib/sorcery/modules/libsorcery#21 (xtext) ====

@@ -653,7 +653,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
@@ -711,7 +711,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