Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-simulation/openttd/files: openttd-1.2.0-cflags.patch openttd-1.1.3-cflags.patch
Date: Thu, 31 May 2012 16:34:55
Message-Id: 20120531163439.812F12004B@flycatcher.gentoo.org
1 mr_bones_ 12/05/31 16:34:39
2
3 Added: openttd-1.2.0-cflags.patch
4 Removed: openttd-1.1.3-cflags.patch
5 Log:
6 clean old; tidy
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 games-simulation/openttd/files/openttd-1.2.0-cflags.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/files/openttd-1.2.0-cflags.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/openttd/files/openttd-1.2.0-cflags.patch?rev=1.1&content-type=text/plain
15
16 Index: openttd-1.2.0-cflags.patch
17 ===================================================================
18 --- config.lib.orig
19 +++ config.lib
20 @@ -1357,14 +1357,12 @@
21 CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
22 LDFLAGS="$LDFLAGS -noixemul"
23 fi
24 -
25 - CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
26 else
27 OBJS_SUBDIR="debug"
28
29 # Each debug level reduces the optimization by a bit
30 if [ $enable_debug -ge 1 ]; then
31 - CFLAGS="$CFLAGS -g -D_DEBUG"
32 + CFLAGS="-D_DEBUG $CFLAGS"
33 if basename "$cc_host" | grep "gcc" &>/dev/null; then
34 # Define only when compiling with GCC, some
35 # GLIBC versions use GNU extensions in a way
36 @@ -1375,14 +1373,6 @@
37 CFLAGS="$CFLAGS -G0"
38 fi
39 fi
40 - if [ $enable_debug -ge 2 ]; then
41 - CFLAGS="$CFLAGS -fno-inline"
42 - fi
43 - if [ $enable_debug -ge 3 ]; then
44 - CFLAGS="$CFLAGS -O0"
45 - else
46 - CFLAGS="$CFLAGS -O2"
47 - fi
48 fi
49
50 if [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
51 @@ -1391,11 +1381,6 @@
52 CFLAGS="$CFLAGS -fno-expensive-optimizations"
53 fi
54
55 - if [ "$enable_profiling" != "0" ]; then
56 - CFLAGS="$CFLAGS -p"
57 - LDFLAGS="$LDFLAGS -pg"
58 - fi
59 -
60 if [ "$with_threads" = "0" ]; then
61 CFLAGS="$CFLAGS -DNO_THREADS"
62 fi