sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (98a8aa9509f0867e0d55377367ea917cf99557d1)

From: Jaka Kranjc <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (98a8aa9509f0867e0d55377367ea917cf99557d1)
Date: Tue, 28 Aug 2007 13:43:11 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3 +++
usr/sbin/gaze | 4 ++++
usr/share/man/man1/gaze.1 | 6 +++---
var/lib/sorcery/modules/libsorcery | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 98a8aa9509f0867e0d55377367ea917cf99557d1
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libsorcery: fixed CXXFLAGS setting in optimise() to not also include the
other CFLAGS_* variables #13965

commit 0dc2521fda1363ef0477ea5e6826d0eb8329f20e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gaze, gaze.1: added missing spell files to parse() and the manpage

diff --git a/ChangeLog b/ChangeLog
index 821e696..8fa6287 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2007-08-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* scribe: fixed a bad message when updating local grimoires
* libsummon: fixed the source_sanity function header
+ * gaze, gaze.1: added missing spell files to parse() and the manpage
+ * libsorcery: fixed CXXFLAGS setting in optimise() to not also
include the
+ other CFLAGS_* variables #13965

2007-08-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze: fixed bad temporary dir usage #13588
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index fbfaab3..a95791b 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -1990,6 +1990,7 @@ parse() {
FINAL) show_spell_component $1 $2 ;;
HISTORY) show_spell_component $1 $2 ;;
INSTALL) show_spell_component $1 $2 ;;
+ INSTALL_EXTRAS) show_spell_component $1 $2 ;;
PATCH) show_spell_component $1 $2 ;;
POST_BUILD) show_spell_component $1 $2 ;;
POST_INSTALL) show_spell_component $1 $2 ;;
@@ -2002,7 +2003,10 @@ parse() {
PRE_SUB_DEPENDS) show_spell_component $1 $2 ;;
PREPARE) show_spell_component $1 $2 ;;
PROVIDES) show_spell_component $1 $2 ;;
+ SECURITY) show_spell_component $1 $2 ;;
SUB_DEPENDS) show_spell_component $1 $2 ;;
+ TRANSFER) show_spell_component $1 $2 ;;
+ TRIGGER_CHECK) show_spell_component $1 $2 ;;
TRIGGERS) show_spell_component $1 $2 ;;
UP_TRIGGERS) show_spell_component $1 $2 ;;

diff --git a/usr/share/man/man1/gaze.1 b/usr/share/man/man1/gaze.1
index ab32fd4..617ad57 100644
--- a/usr/share/man/man1/gaze.1
+++ b/usr/share/man/man1/gaze.1
@@ -221,9 +221,9 @@ after which to abort when no casts could be found.
.PP
.SS SCRIPT_NAME <spell>
.IP
-replace SCRIPT_NAME with any of the following
-BUILD | CONFIGURE | CONFLICTS | DETAILS | DEPENDS | FINAL | HISTORY |
INSTALL | PATCH | POST_BUILD | POST_INSTALL | POST_REMOVE | PRE_BUILD |
PRE_INSTALL | PRE_REMOVE | PREPARE | PROVIDES | TRIGGERS
-to show that spell script for the spell
+show SCRIPT_NAME of the spell, where SCRIPT_NAME is any of the following
spell scripts:
+
+BUILD | CONFIGURE | CONFLICTS | DETAILS | DEPENDS | DOWNLOAD | FINAL |
HISTORY | INSTALL | INSTALL_EXTRAS | PATCH | POST_BUILD | POST_INSTALL |
POST_REMOVE | POST_RESURRECT | PRE_BUILD | PRE_INSTALL | PRE_REMOVE |
PRE_RESURRECT | PRE_SUB_DEPENDS | PREPARE | PROVIDES | SECURITY | SUB_DEPENDS
| TRANSFER | TRIGGER_CHECK | TRIGGERS | UP_TRIGGERS
.PP
.SS history <spell>
.IP
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index f755395..9e4de05 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -814,8 +814,8 @@ function optimize() {
esac
done
# use echo to crunch all the whitespace out for broken configure scripts
- export CFLAGS=$(echo $CFLAGS $CUSTOM_CFLAGS $OVERRIDE_CFLAGS
$USER_SPELL_CFLAGS)
export CXXFLAGS=$(echo $CFLAGS $CUSTOM_CXXFLAGS $OVERRIDE_CXXFLAGS
$USER_SPELL_CXXFLAGS)
+ export CFLAGS=$(echo $CFLAGS $CUSTOM_CFLAGS $OVERRIDE_CFLAGS
$USER_SPELL_CFLAGS)
export LDFLAGS=$(echo $LDFLAGS $CUSTOM_LDFLAGS $OVERRIDE_LDLAGS
$USER_SPELL_LDFLAGS)
export CPPFLAGS=$(echo $CPPFLAGS $CUSTOM_CPPFLAGS $OVERRIDE_CPPFLAGS
$USER_SPELL_CPPFLAGS)
fi

[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (98a8aa9509f0867e0d55377367ea917cf99557d1), Jaka Kranjc, 08/28/2007