From 3281f3f267e91de749a9c449cb06e076e562e6b7 Mon Sep 17 00:00:00 2001
From: Tristan Heaven <nyhm@gentoo.org>
Date: Mon, 31 Aug 2009 21:49:20 +0000
Subject: Don't remove -fno-strict-aliasing from default CFLAGS; respect CC/CXX
 (Portage version: 2.2_rc40/cvs/Linux x86_64)

---
 games-emulation/mupen64plus/ChangeLog              |  6 +++++-
 .../mupen64plus/files/mupen64plus-1.5-flags.patch  | 23 ++++++++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'games-emulation/mupen64plus')

diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog
index d084578f5184..6556d3ce8d8a 100644
--- a/games-emulation/mupen64plus/ChangeLog
+++ b/games-emulation/mupen64plus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64plus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.1 2009/08/28 07:50:00 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.2 2009/08/31 21:49:20 nyhm Exp $
+
+  31 Aug 2009; Tristan Heaven <nyhm@gentoo.org>
+  files/mupen64plus-1.5-flags.patch:
+  Don't remove -fno-strict-aliasing from default CFLAGS; respect CC/CXX
 
 *mupen64plus-1.5 (28 Aug 2009)
 
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch
index d9f5bcbb34ac..d6294e112183 100644
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch
+++ b/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch
@@ -1,9 +1,15 @@
-diff -dupr Mupen64Plus-1-5-src.orig/pre.mk Mupen64Plus-1-5-src/pre.mk
---- Mupen64Plus-1-5-src.orig/pre.mk	2009-08-01 17:27:41.415292353 +0200
-+++ Mupen64Plus-1-5-src/pre.mk	2009-08-01 17:32:29.038293121 +0200
-@@ -151,10 +151,10 @@ CC      = gcc
- CXX     = g++
- LD      = g++
+--- pre.mk
++++ pre.mk
+@@ -147,14 +147,14 @@
+ endif
+ 
+ # set base program pointers and flags
+-CC      = gcc
+-CXX     = g++
+-LD      = g++
++CC      ?= gcc
++CXX     ?= g++
++LD      = $(CXX)
  ifeq ($(OS),LINUX)
 -STRIP	= strip -s
 +STRIP	= true
@@ -14,11 +20,12 @@ diff -dupr Mupen64Plus-1-5-src.orig/pre.mk Mupen64Plus-1-5-src/pre.mk
  endif
  RM      = rm
  RM_F    = rm -f
-@@ -185,19 +185,10 @@ else 
+@@ -185,19 +185,11 @@
  endif
  
  # set base CFLAGS and LDFLAGS
 -CFLAGS += -pipe -O3 -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
++CFLAGS += -fno-strict-aliasing
  CORE_LDFLAGS += -lz -lm -lpng -lfreetype -ldl
  
  # set special flags per-system
@@ -34,7 +41,7 @@ diff -dupr Mupen64Plus-1-5-src.orig/pre.mk Mupen64Plus-1-5-src/pre.mk
    # tweak flags for 32-bit build on 64-bit system
    ifeq ($(ARCH), 64BITS_32)
      CFLAGS += -m32
-@@ -205,7 +196,7 @@ ifeq ($(CPU), X86)
+@@ -205,7 +197,7 @@
    endif
  endif
  ifeq ($(CPU), PPC)
-- 
cgit v1.2.3-65-gdbad