Gentoo Archives: gentoo-commits

From: "Tristan Heaven (nyhm)" <nyhm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-emulation/mupen64plus/files: mupen64plus-1.5-flags.patch
Date: Mon, 31 Aug 2009 16:40:30
Message-Id: E1MiEkb-0006sn-2P@stork.gentoo.org
1 nyhm 09/08/31 21:49:21
2
3 Modified: mupen64plus-1.5-flags.patch
4 Log:
5 Don't remove -fno-strict-aliasing from default CFLAGS; respect CC/CXX
6 (Portage version: 2.2_rc40/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch?r1=1.1&r2=1.2
14
15 Index: mupen64plus-1.5-flags.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- mupen64plus-1.5-flags.patch 28 Aug 2009 07:50:00 -0000 1.1
22 +++ mupen64plus-1.5-flags.patch 31 Aug 2009 21:49:20 -0000 1.2
23 @@ -1,9 +1,15 @@
24 -diff -dupr Mupen64Plus-1-5-src.orig/pre.mk Mupen64Plus-1-5-src/pre.mk
25 ---- Mupen64Plus-1-5-src.orig/pre.mk 2009-08-01 17:27:41.415292353 +0200
26 -+++ Mupen64Plus-1-5-src/pre.mk 2009-08-01 17:32:29.038293121 +0200
27 -@@ -151,10 +151,10 @@ CC = gcc
28 - CXX = g++
29 - LD = g++
30 +--- pre.mk
31 ++++ pre.mk
32 +@@ -147,14 +147,14 @@
33 + endif
34 +
35 + # set base program pointers and flags
36 +-CC = gcc
37 +-CXX = g++
38 +-LD = g++
39 ++CC ?= gcc
40 ++CXX ?= g++
41 ++LD = $(CXX)
42 ifeq ($(OS),LINUX)
43 -STRIP = strip -s
44 +STRIP = true
45 @@ -14,11 +20,12 @@
46 endif
47 RM = rm
48 RM_F = rm -f
49 -@@ -185,19 +185,10 @@ else
50 +@@ -185,19 +185,11 @@
51 endif
52
53 # set base CFLAGS and LDFLAGS
54 -CFLAGS += -pipe -O3 -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
55 ++CFLAGS += -fno-strict-aliasing
56 CORE_LDFLAGS += -lz -lm -lpng -lfreetype -ldl
57
58 # set special flags per-system
59 @@ -34,7 +41,7 @@
60 # tweak flags for 32-bit build on 64-bit system
61 ifeq ($(ARCH), 64BITS_32)
62 CFLAGS += -m32
63 -@@ -205,7 +196,7 @@ ifeq ($(CPU), X86)
64 +@@ -205,7 +197,7 @@
65 endif
66 endif
67 ifeq ($(CPU), PPC)