summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-02-07 21:33:22 +0000
committerMike Frysinger <vapier@gentoo.org>2013-02-07 21:33:22 +0000
commit87553fe32f401b066dc38d63527e4c3983abcb3e (patch)
treec5330b07ebad10cdc45b66264d3168ce15e4dec8 /games-emulation
parentHandle bfin-* targets as pointed out by Luca. (diff)
downloadhistorical-87553fe32f401b066dc38d63527e4c3983abcb3e.tar.gz
historical-87553fe32f401b066dc38d63527e4c3983abcb3e.tar.bz2
historical-87553fe32f401b066dc38d63527e4c3983abcb3e.zip
Fix cross-compiling.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64 Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/snes9x/ChangeLog6
-rw-r--r--games-emulation/snes9x/Manifest5
-rw-r--r--games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch38
-rw-r--r--games-emulation/snes9x/snes9x-1.53.ebuild3
4 files changed, 48 insertions, 4 deletions
diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index f1fb875161c7..5df976c651df 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/snes9x
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.61 2013/01/24 19:29:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.62 2013/02/07 21:32:17 vapier Exp $
+
+ 07 Feb 2013; Mike Frysinger <vapier@gentoo.org>
+ +files/snes9x-1.53-cross-compile.patch, snes9x-1.53.ebuild:
+ Fix cross-compiling.
24 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
-files/snes9x-1.52-build.patch, -snes9x-1.52-r1.ebuild:
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 1a8b20d4d25f..2500d5d85e89 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,5 +1,6 @@
AUX snes9x-1.53-build.patch 2515 SHA256 fb4a34f90041dac78984d9e9548595073731bfd3a8becd865bffca7392c9805b SHA512 8b8059b1d7b92b91463a5bebfde80cacda4cf9749bd1b96cf1658fe1f04e00ef61a932458f425d336fdd77ff123ed53ae01ee33f02a6245776bc52c2d5645921 WHIRLPOOL b86a03b84a58f4a2a61c1f57d31c2642892d8937bc386411561697c1349471e624102cc67f3b73f321b6b822d515fcfa23513325d807986b10ff5d8eb84fb21c
+AUX snes9x-1.53-cross-compile.patch 892 SHA256 a00273a5c272503b33a7f9e6755271c9859dfd0eb487b8ed096229ee36166b79 SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5 WHIRLPOOL 6579e26e0e29174560ffcc9bc8a6154f9c5f70940a7e514a8814a3a0dc4bf38ac2c2ccdad35af07a777dec97aaf99d104cbaf3595e443e78576eb9e710e0cbfa
DIST snes9x-1.53-src.tar.bz2 1838746 SHA256 9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3 SHA512 3ded506d1b3b6cff4e8e3de77ad557d97981eb97ea23ffc68ce5abbbd4677aca819776f1d11b9aa47f5b1a785b19455acf6ad4dbc536d3581d62c192ebdfbd8c WHIRLPOOL 482f0b2c476753b5ffb6ff30b1e5ccb9f50bd0dbe05c7147d5e1c073cd15ce7edd99dc4ea9c14bb50d0bd3cec7edda26e1c54b1b7e0c77b0eb26f9aa09e25f52
-EBUILD snes9x-1.53.ebuild 2795 SHA256 82da9a52374e67b9f060023ddb09c0cf9d83489c631752a16e564568cb8ae8e8 SHA512 9cef845e428370c0a1db3d9b2b204358eda5954e9d84aba6f61de9f037d312cc4995a30630ea68726227bfd7fdeb1e638172e59634af646365af1edc060727ed WHIRLPOOL fbe7cd7d478cb0ebef10dfc04b83bd97353acf2b7f7c3191cbdaceadb628be81925ec13f8bac8e3b15e5a9c01d80639d972fcd15404fc2a71c0c312361479f03
-MISC ChangeLog 9813 SHA256 b7c1930e61721effd0d1eb7bfb26d821afbb8c593ee694f27404fa02529088c7 SHA512 8bbe4c05848e16fcaf9c5e5208c6e19143b432bb438038a9bfcc2d1735665f4b10b1af36a09b18dc45906b3f2edc10032faafb7317d66ffb847d628ab2d3878e WHIRLPOOL 1a29e88349ba660a0b565f7dbdb51a457896e39b55f44fe072ca377b30f06394bef04f717a12c97a38e62aa08df10c30e69fcdaa4fdf67968ba5fefd5be1ccaf
+EBUILD snes9x-1.53.ebuild 2840 SHA256 7f39c4fcc74b0b167025840d84cbfbc3e6d28ecbe89db87c5a8f3f5e66004fae SHA512 62d35ce86ca4e95afffde515409d8dc3e2267732f1d3f5279a2285db2717982ada6aa0159a4441c4b0b3d2b5fc95dc5183c0efc456368ba95dc3e3e2ec1b4707 WHIRLPOOL ccd24928891bfd93606166c65402d681e0e505bc9c4d41449f103c4f2f9ec0b86fa9cee3f84b420ab5d72381c93676764b4323ac106350a481f33a575b4e09d0
+MISC ChangeLog 9946 SHA256 c2060a9b2d8e51b355a33273457e43ec23c0b9a802cc5258a971506834ab1489 SHA512 7d7c942027f030a46ac66be5f81dc971139448e679fb1506701604db4f3d090bf1f5c5ec4c782c19d232cfce114a5c29a7228ff1b855a669823a994720de12e9 WHIRLPOOL 640f116d3f35296a5cf71f2344c6fb23cc8d63affa78aee15b4f2ebc90825bf91dc6b28c29a9b9ac086ab5666cdfd9a363e3cf0272fafdd41439df3fdc8de105
MISC metadata.xml 410 SHA256 8268fac085d0a65ec01574457b3d2f71a13bc24cc89374eed9eaff8ff25f154c SHA512 ed77d9bec10386935798db0fcc6dea6271cbb9dc4efa982fd0034f515a26622a2e25e6697e70665a2482729f5cf31fc4e526bf73e8ed65cdac89aef35ef634fa WHIRLPOOL 43363dadd393706037b56ac6e0cd239dcde8e775594f464bbd44dd64f4b5debe1896d219fc5c02c0c990cee8a6e9a500471d3d74a3954e65989a55d1c0d0cbc7
diff --git a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch b/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
new file mode 100644
index 000000000000..7a0fe8a8bde8
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
@@ -0,0 +1,38 @@
+--- a/unix/configure.ac
++++ b/unix/configure.ac
+@@ -4,7 +4,7 @@ AC_REVISION([$Revision: 1.1 $])
+
+ AC_CONFIG_SRCDIR([unix.cpp])
+
+-AC_CANONICAL_TARGET
++AC_CANONICAL_HOST
+
+ AC_PROG_CC
+ AC_PROG_CXX
+@@ -38,7 +38,7 @@ AC_DEFUN([AC_S9X_COMPILER_FLAG],
+ return (argc);
+ }
+ ],
+- [snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"])
++ [snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"], [snes9x_cv_option_$2="yes"])
+ ])
+
+ CXXFLAGS="[$]OLD_CXXFLAGS"
+@@ -94,7 +94,7 @@ AC_MSG_CHECKING([whether the OS is Linux])
+
+ AC_CACHE_VAL([snes9x_cv_linux_os],
+ [
+- case "$target" in
++ case "$host" in
+ *-*-linux*)
+ snes9x_cv_linux_os="yes"
+ ;;
+@@ -332,7 +332,7 @@ AC_DEFUN([AC_S9X_CHECK_SAR],
+ return (i < 0 ? 0 : 1);
+ }
+ ],
+- [snes9x_sar_$1="yes"], [snes9x_sar_$1="no"])
++ [snes9x_sar_$1="yes"], [snes9x_sar_$1="no"], [snes9x_sar_$1=$GCC])
+
+ CXXFLAGS="[$]OLD_CXXFLAGS"
+
diff --git a/games-emulation/snes9x/snes9x-1.53.ebuild b/games-emulation/snes9x/snes9x-1.53.ebuild
index 18bb14a8f495..8b6f5dc6bcc5 100644
--- a/games-emulation/snes9x/snes9x-1.53.ebuild
+++ b/games-emulation/snes9x/snes9x-1.53.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.53.ebuild,v 1.9 2013/01/24 19:24:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.53.ebuild,v 1.10 2013/02/07 21:32:17 vapier Exp $
EAPI=2
inherit autotools eutils flag-o-matic multilib gnome2-utils games
@@ -44,6 +44,7 @@ src_prepare() {
sed -i -e '75i#define OF(x) x' unzip/{un,}zip.h || die
sed -i -e '22i#define OF(x) x' unzip/ioapi.h || die
epatch "${FILESDIR}"/${P}-build.patch
+ epatch "${FILESDIR}"/${P}-cross-compile.patch
cd unix
eautoreconf
if use gtk; then