[mupen64plus] 121/262: Don't override optimisations set by debian build environment

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 604d00f7da51b12139fc84994d77c016e736f70d
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Tue Sep 8 21:32:58 2009 +0200

    Don't override optimisations set by debian build environment
---
 debian/changelog                               |  4 ++-
 debian/patches/122-default-optimisations.patch | 47 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 950d4d7..520b5b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ mupen64plus (1.5+dfsg1-4) UNRELEASED; urgency=low
       (Closes: #545463)
     - Add 120-ftbfs-glibc210, Fix FTBFS using g++-4.4 and glibc 2.10 due to
       missing const keywords (Closes: #545462)
-    - Add 121-version-string.patch, remove misleading -development in version
+    - Add 121-version-string.patch, remove misleading "-development" in version
       string
+    - Add 122-default-optimisations.patch, Don't override optimisations set by
+      debian build environment
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 07 Sep 2009 11:44:11 +0200
 
diff --git a/debian/patches/122-default-optimisations.patch b/debian/patches/122-default-optimisations.patch
new file mode 100644
index 0000000..1e9dcc9
--- /dev/null
+++ b/debian/patches/122-default-optimisations.patch
@@ -0,0 +1,47 @@
+From 23d1fb825ba2dee370046f318ad91e9471b70479 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven.eckelmann at gmx.de>
+Date: Tue, 8 Sep 2009 21:27:01 +0200
+Subject: [PATCH] Don't override optimisations set by build environment
+
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ pre.mk |   11 +++--------
+ 1 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/pre.mk b/pre.mk
+index 2c74ef5..d208340 100644
+--- a/pre.mk
++++ b/pre.mk
+@@ -305,15 +305,13 @@ else
+ 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
+ ifeq ($(CPU), X86)
+-  ifeq ($(ARCH), 64BITS)
+-    CFLAGS += -march=athlon64
+-  else
+-    CFLAGS += -march=i686 -mtune=pentium-m -mmmx -msse
++  ifneq ($(ARCH), 64BITS)
++    CFLAGS += -mmmx -msse
+     ifneq ($(PROFILE), 1)
+       CFLAGS += -fomit-frame-pointer
+     endif
+@@ -324,9 +322,6 @@ ifeq ($(CPU), X86)
+     LDFLAGS += -m32 -m elf_i386
+   endif
+ endif
+-ifeq ($(CPU), PPC)
+-  CFLAGS += -mcpu=powerpc
+-endif
+ ifeq ($(CPU_ENDIANNESS), BIG)
+   CFLAGS += -D_BIG_ENDIAN
+ endif
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 387344b..3fa7583 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@
 119-debian-archs.patch
 120-ftbfs-glibc210.patch
 121-version-string.patch
+122-default-optimisations.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git