sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master z-rejected grimoire by Thomas Orgis (4bb13c687d2a2049008766a27a0aa37d9af63776)
- From: Thomas Orgis <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Thomas Orgis (4bb13c687d2a2049008766a27a0aa37d9af63776)
- Date: Sat, 24 Jun 2006 09:50:33 -0500
GIT changes to master z-rejected grimoire by Thomas Orgis
<orgis AT adams.agnld.uni-potsdam.de>:
ChangeLog | 3 +++
FUNCTIONS | 17 +++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
New commits:
commit 4bb13c687d2a2049008766a27a0aa37d9af63776
Author: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>
Commit: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>
updated disable_pic for alpha
commit f8f73b59eab0012bfa35fbcc63a395c62fd0cc67
Author: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>
Commit: Thomas Orgis <orgis AT adams.agnld.uni-potsdam.de>
updated disable_pic for alpha
diff --git a/ChangeLog b/ChangeLog
index 972c526..e496507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-06-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: added alpha as PICy arch to disable_pic
+
2006-06-09 Arjan Bouter <abouter AT sourcemage.org>
* FUNCTIONS: added default_games_build from games/FUNCTIONS
to allow spells moved from games to build
diff --git a/FUNCTIONS b/FUNCTIONS
index 2df866c..7fcec4a 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -434,14 +434,15 @@ ## has one optional parameter: force whi
#---
disable_pic() {
-if [[ "$SMGL_COMPAT_ARCHS[1]" != "x86_64" ]] ||
- [[ "$1" == "force" ]]
-then
-CFLAGS=${CFLAGS/-fPIC} &&
-CFLAGS=${CFLAGS/-DPIC} &&
-CXXFLAGS=${CXXFLAGS/-fPIC} &&
-CXXFLAGS=${CXXFLAGS/-DPIC}
-fi
+ if [[ "${SMGL_COMPAT_ARCHS[1]}" != "x86_64" ]] &&
+ [[ "${SMGL_COMPAT_ARCHS[1]}" != "alpha" ]] ||
+ [[ "$1" == "force" ]]
+ then
+ CFLAGS=${CFLAGS/-fPIC} &&
+ CFLAGS=${CFLAGS/-DPIC} &&
+ CXXFLAGS=${CXXFLAGS/-fPIC} &&
+ CXXFLAGS=${CXXFLAGS/-DPIC}
+ fi
}
#
## Function to check if we're using xorg-modular libs or not
- [SM-Commit] GIT changes to master z-rejected grimoire by Thomas Orgis (4bb13c687d2a2049008766a27a0aa37d9af63776), Thomas Orgis, 06/24/2006
Archive powered by MHonArc 2.6.24.