[SM-Commit] PERFORCE change 77587 by Andra?? "ruskie" Levstik for review

Perforce Review Daemon p4review at smee.org
Tue Apr 11 05:10:03 EDT 2006


Change 77587 by andraž_levstik at omega.mages.ath.cx on 2006/04/11 10:06:03

	And to games and z-rejected

Affected files ...

... //sgl/grimoires/games/ChangeLog#46 integrate
... //sgl/grimoires/games/FUNCTIONS#19 integrate
... //sgl/grimoires/z-rejected/ChangeLog#32 integrate
... //sgl/grimoires/z-rejected/FUNCTIONS#8 integrate

Differences ...

==== //sgl/grimoires/games/ChangeLog#46 (text) ====

@@ -1,3 +1,7 @@
+2006-04-11 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* FUNCTIONS: added a new function: disable_pic()
+	  should be used when needing to get rid of -fPIC and -DPIC flags
+
 2006-04-10 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* games-puzzles/gplanarity: new spell
 
@@ -44,7 +48,7 @@
 
 2006-02-28 Mathieu Lonjaret <lejatorn at sourcemagecom>
 	* games-arcade-3d: added new spells xshipwars-client and
-	xshipwars-server
+	  xshipwars-server
 
 2006-02-25 George Sherwood <george at beernabeer.com>
 	* games-simulation/simgear: Moved to games-libs

==== //sgl/grimoires/games/FUNCTIONS#19 (xtext) ====

@@ -202,3 +202,20 @@
   unpack_hash ${!SVAR} ${!AVAR}
 }
 
+
+#---
+## disable_pic
+## A function to smartly disable -DPIC and -fPIC flags
+## has one optional parameter: force which forces disable
+#---
+
+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
+}

==== //sgl/grimoires/z-rejected/ChangeLog#32 (text) ====

@@ -1,3 +1,7 @@
+2006-04-11 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* FUNCTIONS: added a new function: disable_pic()
+	  should be used when needing to get rid of -fPIC and -DPIC flags
+
 2006-04-03 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
         * z-games/snes9x: moved to z-games      
 
@@ -13,7 +17,7 @@
 
 2006-02-24 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* z-audio/gst-monkeysaudio: moved from normal grimoire due to licensing
-		issues
+	  issues
 
 2006-02-24 Eric Sandall <eric at sandall.us>
 	* z-games/true-combat-elite: Added Wolfenstein: Enemy Territory mod
@@ -28,9 +32,9 @@
 2005-12-02 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* z-video/quicktime-codecs, z-video/real-codecs, z-video/win32codecs,
 	  z-video/xanim-codecs:
-		moved from devel
+	  moved from devel
 	* REJECTED_MSG: get variable values for REJECT and WEB_SITE from DETAILS so
-		it works in PREPARE
+	  it works in PREPARE
 
 2005-11-28 Ladislav Hagara <hgr at vabo.cz>
 	* z-crypto/truecrypt: new spell
@@ -217,7 +221,7 @@
 
 2004-04-12 Eric Sandall <eric at sandall.us>
 	* z-java/jaf,jms,jmx,jdmk,jndi,java_xml_pack,javamail,jdbc-optional,jta:
-	Moved from java due to licensing
+	  Moved from java due to licensing
 
 2004-01-29 Eric Sandall <eric at sandall.us>
 	* Moved z-video/xvid to devel grimoire video-libs/xvid

==== //sgl/grimoires/z-rejected/FUNCTIONS#8 (xtext) ====

@@ -395,7 +395,6 @@
   python setup.py install ${INSTALL_ROOT:+--root "$INSTALL_ROOT/"}
 }
 
-
 #-------------------------------------------------------------------------
 ## Compatibility code for gracefully failing if the user uses an older
 ## version of sorcery with a spell that calls unpack_file.
@@ -426,3 +425,21 @@
 		ARCHITECTURE[j++]=${SMGL_COMPAT_ARCHS[i]}
 	done
 fi
+
+
+#---
+## disable_pic
+## A function to smartly disable -DPIC and -fPIC flags
+## has one optional parameter: force which forces disable
+#---
+
+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
+}



More information about the SM-Commit mailing list