Source Mage code commit list

[Andrew Stitt <scm AT mail.sourcemage.org>]

GIT changes to devel sorcery by Andrew Stitt <astitt AT sourcemage.org>:

 ChangeLog                          |    4 ++++
 usr/sbin/cast                      |    7 +++++--
 usr/sbin/sorcery                   |    5 ++++-
 usr/share/man/man8/cast.8          |    4 ++--
 var/lib/sorcery/modules/libcast    |    5 ++++-
 var/lib/sorcery/modules/libsorcery |    4 +++-
 6 files changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 26a9582e7352c6ed49874c22d56b7dab877b74f7
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

    fix bug 12327

diff --git a/ChangeLog b/ChangeLog
index 5e25e86..d79341d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
+       cast, sorcery, man8/cast.8, libcast, libsorcery: add cppflags option,
+         bug 12327, patch from Thomas Orgis.
+
+2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
        * libdepends: workaround bug in bash 3.0-16, syntax for
          intialization of local arrays is broken.
 
diff --git a/usr/sbin/cast b/usr/sbin/cast
index 0af1e06..33c6f4f 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -23,10 +23,11 @@ Optional Parameters:
 
        --cflags                 Custom CFLAGS
        --cxxflags               Custom CXXFLAGS
+       --cppflags               Custom CPPFLAGS
        --ldflags                Custom LDFLAGS
        --no-opts                Turn off setting optimization flags, except
-                                for those found in --cflags, --cxxflags and
-                                --ldflags
+                                for those found in --cflags, --cxxflags,
+                                --cppflags and --ldflags.
 
 -V [on|off]                     Override \$VOYEUR setting
 
@@ -103,6 +104,7 @@ function process_parameters()  {
 
             --cflags)  export OVERRIDE_CFLAGS="$2";    COMPILE="-c"; shift 2 
 ;;
           --cxxflags)  export OVERRIDE_CXXFLAGS="$2";  COMPILE="-c"; shift 2 
 ;;
+          --cppflags)  export OVERRIDE_CPPFLAGS="$2";  COMPILE="-c"; shift 2 
 ;;
            --ldflags)  export OVERRIDE_LDFLAGS="$2";   COMPILE="-c"; shift 2 
 ;;
            --no-opts)  export NO_OPTIMIZATION_FLAGS=1; COMPILE="-c"; shift 1 
 ;;
                   -V)  export VOYEUR_OVERRIDE="$2";                  shift 2 
 ;;
@@ -185,6 +187,7 @@ function strip_parameters()  {
                   --deps)  shift 1  ;;
                 --cflags)  shift 2  ;;
               --cxxflags)  shift 2  ;;
+              --cppflags)  shift 2  ;;
                --ldflags)  shift 2  ;;
                --no-opts)  shift 1  ;;
                       -V)  shift 2  ;;
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 558e0a9..ee72138 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -832,7 +832,8 @@ custom_optimization_menu() {
                              17 50 9 \
                              CFLAGS "$CUSTOM_CFLAGS" \
                              CXXFLAGS "$CUSTOM_CXXFLAGS" \
-                             LDFLAGS "$CUSTOM_LDFLAGS"'`)
+                             LDFLAGS "$CUSTOM_LDFLAGS" \
+                             CPPFLAGS "$CUSTOM_CPPFLAGS"'`)
     rc=$?
     [[ $rc == 0 ]] || [[ $rc == 1 ]] && break
     set ${RESULTS[*]}
@@ -841,6 +842,7 @@ custom_optimization_menu() {
     case "$KEY" in
       CFLAGS) CUSTOM_CFLAGS="$@"  ;;
       CXXFLAGS) CUSTOM_CXXFLAGS="$@" ;;
+      CPPFLAGS) CUSTOM_CPPFLAGS="$@" ;;
       LDFLAGS) CUSTOM_LDFLAGS="$@" ;;
     esac
   done
@@ -850,6 +852,7 @@ custom_optimization_menu() {
     modify_local_config CUSTOM_CFLAGS "$CUSTOM_CFLAGS"
     modify_local_config CUSTOM_CXXFLAGS "$CUSTOM_CXXFLAGS"
     modify_local_config CUSTOM_LDFLAGS "$CUSTOM_LDFLAGS"
+    modify_local_config CUSTOM_CPPFLAGS "$CUSTOM_CPPFLAGS"
   fi
 }
 
diff --git a/usr/share/man/man8/cast.8 b/usr/share/man/man8/cast.8
index 1860c6e..9841f5f 100644
--- a/usr/share/man/man8/cast.8
+++ b/usr/share/man/man8/cast.8
@@ -30,8 +30,8 @@ This disables that behavior.
 .SS "--deps"
 Determines dependencies for the given spell(s) and casts the dependencies,
 but does not cast the given spell(s) itself.
-.SS "--cflags, --cxxflags, --ldflags"
-Set custom cflags/cxxflags/ldflags values to override those found in
+.SS "--cflags, --cxxflags, --ldflags, --cppflags"
+Set custom cflags/cxxflags/ldflags/cppflags values to override those found in
 arch specs, and set through the sorcery menu.
 .SS "--no-opts"
 Disable the use of optimization flags from arch specs and the sorcery
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 08a9cef..2bf879c 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -141,6 +141,7 @@ function query_custom_cflags() {
     persistent_add USER_SPELL_CFLAGS
     persistent_add USER_SPELL_CXXFLAGS
     persistent_add USER_SPELL_LDFLAGS
+    persistent_add USER_SPELL_CPPFLAGS
     local RESULTS KEY rc
     while true ; do
       # input box returns things of the form "RENAMED CFLAGS -O3 -march=foo 
..."
@@ -151,7 +152,8 @@ function query_custom_cflags() {
                                17 50 9 \
                                CFLAGS "$USER_SPELL_CFLAGS" \
                                CXXFLAGS "$USER_SPELL_CXXFLAGS" \
-                               LDFLAGS "$USER_CUSTOM_LDFLAGS"'`)
+                               LDFLAGS "$USER_SPELL_LDFLAGS"' \
+                               CPPFLAGS "$USER_SPELL_CPPFLAGS"`)
       rc=$?
       [[ $rc == 0 ]] || [[ $rc == 1 ]] && break
       set ${RESULTS[*]}
@@ -161,6 +163,7 @@ function query_custom_cflags() {
         CFLAGS) USER_SPELL_CFLAGS="$@"  ;;
         CXXFLAGS) USER_SPELL_CXXFLAGS="$@" ;;
         LDFLAGS) USER_SPELL_LDFLAGS="$@" ;;
+       CPPFLAGS) USER_SPELL_CPPFLAGS="$@" ;;
       esac
     done
   fi
diff --git a/var/lib/sorcery/modules/libsorcery 
b/var/lib/sorcery/modules/libsorcery
index 182aa01..6f57bd1 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -644,7 +644,7 @@ #---------------------------------------
 function optimize()  {
   debug "libsorcery" "In optimize()"
 
-  unset  CFLAGS CXXFLAGS LDFLAGS
+  unset  CFLAGS CXXFLAGS LDFLAGS CPPFLAGS
   unset  COMBRELOC FAST PRELINK RISKY SMALL SPEEDY STRIP TINY
 
   # if user specified --no-opts then use only the args from the command line
@@ -653,6 +653,7 @@ function optimize()  {
     export CFLAGS="$OVERRIDE_CFLAGS"
     export CXXFLAGS="$OVERRIDE_CXXFLAGS"
     export LDFLAGS="$OVERRIDE_LDLAGS"
+    export CPPFLAGS="$OVERRIDE_CPPFLAGS"
   else
     set_architecture
     debug "ARCHITECTURE='${ARCHITECTURE}'"
@@ -701,6 +702,7 @@ function optimize()  {
     export CFLAGS=$(echo $CFLAGS $CUSTOM_CFLAGS $OVERRIDE_CFLAGS 
$USER_SPELL_CFLAGS)
     export CXXFLAGS=$(echo $CFLAGS $CUSTOM_CXXFLAGS $OVERRIDE_CXXFLAGS 
$USER_SPELL_CXXFLAGS)
     export LDFLAGS=$(echo $LDFLAGS $CUSTOM_LDFLAGS $OVERRIDE_LDLAGS 
$USER_SPELL_LDFLAGS)
+    export CPPFLAGS=$(echo $CPPFLAGS $CUSTOM_CPPFLAGS $OVERRIDE_CPPFLAGS 
$USER_SPELL_CPPFLAGS)
   fi
 
 }