summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2009-08-31 21:49:20 +0000
committerTristan Heaven <tristan@gentoo.org>2009-08-31 21:49:20 +0000
commit83a89da0b6420c0910538a6878c504ba56fca008 (patch)
tree69cb0dd92fdb2d2f142832c8650c6d29fdaca0ec /games-emulation/mupen64plus
parentQ.A. fixes, including better dependency on ClustalW. (diff)
downloadhistorical-83a89da0b6420c0910538a6878c504ba56fca008.tar.gz
historical-83a89da0b6420c0910538a6878c504ba56fca008.tar.bz2
historical-83a89da0b6420c0910538a6878c504ba56fca008.zip
Don't remove -fno-strict-aliasing from default CFLAGS; respect CC/CXX
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'games-emulation/mupen64plus')
-rw-r--r--games-emulation/mupen64plus/ChangeLog6
-rw-r--r--games-emulation/mupen64plus/Manifest14
-rw-r--r--games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch23
3 files changed, 32 insertions, 11 deletions
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/Manifest b/games-emulation/mupen64plus/Manifest
index 108cb06d32dc..d9b47888a99c 100644
--- a/games-emulation/mupen64plus/Manifest
+++ b/games-emulation/mupen64plus/Manifest
@@ -1,8 +1,18 @@
-AUX mupen64plus-1.5-flags.patch 1204 RMD160 64d248c8200465398a1fd1cc5308f416d0fd36b1 SHA1 b06acd845203e078bf1e2d6043f62948f7757821 SHA256 39ccc5f2c30ff86a9b943befdacec6c3355e0d708e219c188f87ab0b0c61bf15
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mupen64plus-1.5-flags.patch 1123 RMD160 a38f07f536c4d31a019e8742319c73644422c25d SHA1 7b5946e1826e21be0b8cf612274585f378a7f86b SHA256 a14a2e6b7972d8fe461639888eb534e62413c0c05aba91c19149c511f9e9dc10
AUX mupen64plus-1.5-glide64-gcc44.patch 1262 RMD160 28ccdd74a669af58363501f386acf290cf6a55bd SHA1 5113cffff2c0a472bd37325fa0f582850d71fac0 SHA256 fc9665e4cfa8ae99ab1a4e8d1810d257d81f6cd2c59fc3ac4b7b5d1ec42ef069
AUX mupen64plus-1.5-plugindir.patch 722 RMD160 905d38cd37f4afdc67d2e7ac7f8d66a5bc9a296a SHA1 d4b77ace873c4a50ebe89fe81f523c6e00dffc8d SHA256 07507a688ab77322317cf3b7fb6419f681386b343c77d26bf3fd01afa3348276
AUX mupen64plus-1.5-unbundle-bzip2.patch 1317 RMD160 98403a2c3853fc60c666180b106a735e8c8410a3 SHA1 9ff21c4c945dc475f7c248f738913adb13d29b82 SHA256 cc5e3e15ad44b2c5483b222dd55bba8588759ac032b97667d9e3c69d590938e0
DIST Mupen64Plus-1-5-src.tar.gz 2348443 RMD160 690d1e80d4a10a3a74e7d955c0ee23e3bd4ff996 SHA1 ef200d6ea2eb3faa969ba9c82d2a771236c3145d SHA256 58b2da6095ed8f3bcdcb5d7612bb0f1ba81cda1861ca784ef7e46991fd73cf3f
EBUILD mupen64plus-1.5.ebuild 3097 RMD160 f462dbc2d138ec720acfd6a03c1cb2c62af70caa SHA1 f2f0ef4d440045437c44653b8cee7f265ed7de27 SHA256 1faf19ef811248bb64dcc52fc60f1fa4f84975c332fcd82270ec81a07f27de49
-MISC ChangeLog 1040 RMD160 c2af5081ef4143ee3386f1ce901314b5331c2f26 SHA1 a6e9c29b148b0507d09296c474ed025a5036f4ba SHA256 f344b97e732df36c125ce4498fc5f9c5674053d6e55255fd41ec916fb851d3e0
+MISC ChangeLog 1197 RMD160 6c415250170f5ba99d1e12840a2e71d09b4bf66e SHA1 5a1968b9d0a0364c60205cc87a39a23a3e6c95b7 SHA256 a1ad4aab05eb95f1b20bc746b945aa841e828ca20935f2c579d6ca87b95d43c0
MISC metadata.xml 679 RMD160 a52b94f3dac0302970e9b6d9ead4341ca3722d5c SHA1 cddc937cadb60d9a67c578c815f192136b1dd701 SHA256 8cb8d6f4a9724cde575da81a562322e28c628a7bd7233de3424a3c001a006a2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqcRWYACgkQdz7hIScOURHLnQCgy+nvuiVmGYtY/7xfY/pBKBZV
+2XAAoJdOKvoA22MIxKLgqTE0Lh2iw6hE
+=0a30
+-----END PGP SIGNATURE-----
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)