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