[gentoo-commits] gentoo-x86 commit in games-simulation/openttd/files: openttd-1.1.2-cflags.patch

[gentoo-commits] gentoo-x86 commit in games-simulation/openttd/files: openttd-1.1.2-cflags.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    11/09/01 03:11:21

  Added:                openttd-1.1.2-cflags.patch
  Log:
  version bump
  
  (Portage version: 2.1.10.11/cvs/Linux i686)

Revision  Changes    Path
1.1                  games-simulation/openttd/files/openttd-1.1.2-cflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/files/openttd-1.1.2-cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/files/openttd-1.1.2-cflags.patch?rev=1.1&content-type=text/plain

Index: openttd-1.1.2-cflags.patch
===================================================================
--- config.lib.orig	2011-08-08 11:40:21.641085825 -0400
+++ config.lib	2011-08-08 11:44:19.655285851 -0400
@@ -1357,14 +1357,12 @@
 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
 			LDFLAGS="$LDFLAGS -noixemul"
 		fi
-
-		CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
 	else
 		OBJS_SUBDIR="debug"
 
 		# Each debug level reduces the optimization by a bit
 		if [ $enable_debug -ge 1 ]; then
-			CFLAGS="$CFLAGS -g -D_DEBUG"
+			CFLAGS="-D_DEBUG $CFLAGS"
 			if basename "$cc_host" | grep "gcc" &>/dev/null; then
 				# Define only when compiling with GCC, some
 				# GLIBC versions use GNU extensions in a way
@@ -1375,14 +1373,6 @@
 				CFLAGS="$CFLAGS -G0"
 			fi
 		fi
-		if [ $enable_debug -ge 2 ]; then
-			CFLAGS="$CFLAGS -fno-inline"
-		fi
-		if [ $enable_debug -ge 3 ]; then
-			CFLAGS="$CFLAGS -O0"
-		else
-			CFLAGS="$CFLAGS -O2"
-		fi
 	fi
 
 	if [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
@@ -1391,11 +1381,6 @@
 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
 	fi
 
-	if [ "$enable_profiling" != "0" ]; then
-		CFLAGS="$CFLAGS -p"
-		LDFLAGS="$LDFLAGS -pg"
-	fi
-
 	if [ "$with_threads" = "0" ]; then
 		CFLAGS="$CFLAGS -DNO_THREADS"
 	fi