Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (c6d269a229b310295214db2ba3400cd62249ccfa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (c6d269a229b310295214db2ba3400cd62249ccfa)
  • Date: Wed, 14 Oct 2009 04:02:39 -0500

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 14 ++++++++++++++
etc/sorcery/version | 2 +-
install | 17 ++++++++++++++++-
usr/sbin/gaze | 2 +-
usr/sbin/sorcery | 4 +---
var/lib/sorcery/modules/libsorcery | 10 ++--------
var/lib/sorcery/protected | 1 +
7 files changed, 36 insertions(+), 14 deletions(-)

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

1.14.5-rc1

commit 844bf4f5cbe2da9bab30a260a5a24c095eede19c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gaze: quote $SHORT to prevent glob expansion #15460

(cherry-picked from commit 488f2a3f7655337a7881877607a3b98b7912466e)

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

sorcery, libsorcery: removed combreloc, it is on by default where
appropriate #10750

(cherry-picked from commit c66d120060bcc8d27280f7527c05aa08ea8f1de6)

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

protected: added tr for heisenbug #15408

(cherry-picked from commit 4a857439843248d5fe8a9eec5da9171682336ac7)

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

install: symlink also host dependent compiler names, so ccache and
distcc can be used there too, patch from David Brown #13142

(cherry-picked from commit 75fa4753331db1781555d59caa49665ac03789dd)

diff --git a/ChangeLog b/ChangeLog
index 73f999a..3f9b1f9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gaze: quote $SHORT to prevent glob expansion #15460
+
+2009-10-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * sorcery, libsorcery: removed combreloc, it is on by default where
+ appropriate #10750
+
+2009-10-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * protected: added tr for heisenbug #15408
+
+2009-09-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * install: symlink also host dependent compiler names, so ccache and
+ distcc can be used there too, patch from David Brown #13142
+
2009-08-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* sustained: removed texinfo #15374

diff --git a/etc/sorcery/version b/etc/sorcery/version
index 1ebbef4..fa71c5f 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.4-rc3
+1.14.5-rc1
diff --git a/install b/install
index a061d6b..9caf5d8 100755
--- a/install
+++ b/install
@@ -63,7 +63,22 @@ echo /usr/share/doc/sorcery/ChangeLog >>
$SORCERY_INSTALL_LOG
echo "Setting up build symlinks"
BUILD_DIR=${INSTALL_ROOT}/var/lib/sorcery/build
pushd $BUILD_DIR &> /dev/null || exit 1
-for COMPILER in "cc" "gcc" "c++" "g++"; do
+# optionally put in HOST style compilers
+ARCHITECTURE=$(grep ARCHITECTURE /etc/sorcery/local/config | sed
's/[^-]*-\(.*\)}.*/\1/')
+HOST_COMPILE=""
+if [[ $ARCHITECTURE ]]
+then
+ archspec=$(find /usr/share/archspecs -type f -name $ARCHITECTURE)
+ if [[ -f $archspec ]]
+ then
+ HOST=$(grep HOST $archspec | sed 's/.*"\(.*\)".*/\1/')
+ for COMPILER in "c++" "g++" "gcc"
+ do
+ HOST_COMPILE="$HOST_COMPILE $HOST-$COMPILER"
+ done
+ fi
+fi
+for COMPILER in "cc" "gcc" "c++" "g++" $HOST_COMPILE; do
ln -sf "run_compiler" "$COMPILER"
echo $BUILD_DIR/$COMPILER >> $SORCERY_INSTALL_LOG
done
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index dc703fe..4abfba6 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -1402,7 +1402,7 @@ function gaze_show_short_description() {
message "${SPELL_COLOR}${spell}:${DEFAULT_COLOR}"
(
codex_set_current_spell_by_name $spell &&
- echo $SHORT
+ echo "$SHORT"
) ||
{ message "No details found! Please file a bug!"
return 1
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index ab499c5..6b48561 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -784,13 +784,12 @@ architecture_menu() {
optimization_menu(){

local OPTIMIZATIONS=${OPTIMIZATIONS}
- # this is here so COMBRELOC, PRELINK, RISKY, etc. are set
+ # this is here so PRELINK, RISKY, etc. are set
# and appear in the menu
optimize
local OPT_TITLE="Optimization Menu"
local OPT_HELP="Please select optimizations"

- local COMBRELOC_HELP="Speed up loading libs, also needed for prelink
(LDFLAGS=-z combreloc)"
local PRELINK_HELP="Speed up loading applications by pre-linking
libraries (CFLAGS=-DPIC -fPIC)"
local RISKY_HELP="Optimize by violating ANSI/IEEE (unsafe)
(CFLAGS=-ffast-math -funroll-loops)"
local SPEEDY_HELP="Optimize generated code, conflicts with 'tiny'
(CFLAGS=$FAST)"
@@ -804,7 +803,6 @@ optimization_menu(){
--checklist \
"$OPT_HELP" \
0 0 0 \
- "combreloc" " ++speed" "$COMBRELOC" "$COMBRELOC_HELP" \
"prelink" " +speed" "$PRELINK" "$PRELINK_HELP" \
"risky" " +speed" "$RISKY" "$RISKY_HELP" \
"speedy" " +size ++speed" "$SPEEDY" "$SPEEDY_HELP" \
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index f7b5a19..dc03b32 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -757,15 +757,14 @@ function push_remove_queue() {
## option passed. Options may be on or more of: i386, i486, i586,
## pentium, pentium-mmx, i686, pentiumpro, pentium2, pentium3,
## pentium4, k6, k6-2, k6-3, athlon, athlon-tbird, athlon-4,
-## athlon-xp, athlon-mp, powerpc, speedy, tiny, risky, strip,
-## combreloc
+## athlon-xp, athlon-mp, powerpc, speedy, tiny, risky, strip
##
#---------------------------------------------------------------------
function optimize() {
debug "libsorcery" "In optimize()"

unset CFLAGS CXXFLAGS LDFLAGS CPPFLAGS
- unset COMBRELOC FAST PRELINK RISKY SMALL SPEEDY STRIP TINY
+ unset FAST PRELINK RISKY SMALL SPEEDY STRIP TINY

# if user specified --no-opts then use only the args from the command line
# otherwise do the normal stuff
@@ -786,11 +785,6 @@ function optimize() {
CFLAGS="$CFLAGS -pipe"
for PARAM in $OPTIMIZATIONS; do
case $PARAM in
- combreloc)
- LDFLAGS="$LDFLAGS -z combreloc"
- COMBRELOC="on"
- ;;
-
prelink)
CFLAGS="$CFLAGS -DPIC -fPIC"
PRELINK="on"
diff --git a/var/lib/sorcery/protected b/var/lib/sorcery/protected
index 24ecff6..c6d5c47 100755
--- a/var/lib/sorcery/protected
+++ b/var/lib/sorcery/protected
@@ -22,6 +22,7 @@
^/bin/basename$
^/bin/md5sum$
^/bin/install$
+^/bin/tr$
^/usr/bin/install$
^/bin/su$
^/sbin/ldconfig$



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (c6d269a229b310295214db2ba3400cd62249ccfa), Jaka Kranjc, 10/14/2009

Archive powered by MHonArc 2.6.24.

Top of Page