diff options
| author |   Christian Birchinger <joker@gentoo.org> | 2011-12-13 01:40:02 +0000 |
|---|---|---|
| committer | Christian Birchinger <joker@gentoo.org> | 2011-12-13 01:40:02 +0000 |
| commit | a1f401acb307cf361156d2d0c1005702264afae5 (patch) | |
| tree | 33aade3a20b5ce3d5992b4bf844f6884ff12ccfb /games-emulation | |
| parent | Version bump. (diff) | |
| download | historical-a1f401acb307cf361156d2d0c1005702264afae5.tar.gz historical-a1f401acb307cf361156d2d0c1005702264afae5.tar.bz2 historical-a1f401acb307cf361156d2d0c1005702264afae5.zip | |
Make it use the user configured CC (also needed as linker because the args are not LD compatible) and CXX. However, this will not cause it to build cleanly with non-gcc compilers like clang.
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/mupen64plus/ChangeLog | 8 | ||||
| -rw-r--r-- | games-emulation/mupen64plus/Manifest | 14 | ||||
| -rw-r--r-- | games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild | 7 |
3 files changed, 13 insertions, 16 deletions
diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog index 1aaf29aa14e7..3493350735d2 100644 --- a/games-emulation/mupen64plus/ChangeLog +++ b/games-emulation/mupen64plus/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-emulation/mupen64plus # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.15 2011/09/24 05:48:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.16 2011/12/13 01:40:02 joker Exp $ + + 13 Dec 2011; Christian Birchinger <joker@gentoo.org> + mupen64plus-1.5-r2.ebuild: + Make it use the user configured CC (also needed as linker because the args + are not LD compatible) and CXX. However, this will not cause it to build + cleanly with non-gcc compilers like clang 24 Sep 2011; Mike Frysinger <vapier@gentoo.org> mupen64plus-1.5-r2.ebuild, +files/mupen64plus-1.5-minizip.patch: diff --git a/games-emulation/mupen64plus/Manifest b/games-emulation/mupen64plus/Manifest index 220376c9fdf4..fe191acf80bb 100644 --- a/games-emulation/mupen64plus/Manifest +++ b/games-emulation/mupen64plus/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX README.gentoo-patches-20091123 1355 RMD160 36a949e4205699623c4a5283abe38f4062783560 SHA1 d144cc1167d6c02008f0afb25ec3792e650f066c SHA256 472ca36495f5cd59c66a23d4660dff19e890c7bca9c389352a54371f9aae5b2e AUX README.gentoo-patches-20100507 1521 RMD160 1f5f8e1fa80816df8f39763f7e82e1f24d0236f3 SHA1 77c68a0cc466252561ce1e9cc23ca5a31eccb440 SHA256 c760661690d7f466bbd8640bae085b35f1e20b6c3ec882092b7547cbd32efccd AUX ftbfs-gvariant-type-conflicts.patch 828 RMD160 588773a037a037f83fcf25a94ed29cc7a161e614 SHA1 f43a04f16b555fe81935fc1ba1ced2d71cba72bf SHA256 14483751e07912daeabb35b31f1b2fdae454658e00ea1a10627de29bd43881c0 @@ -11,13 +8,6 @@ DIST Mupen64Plus-1-5-src.tar.gz 2348443 RMD160 690d1e80d4a10a3a74e7d955c0ee23e3b DIST mupen64plus-1.5-patches-20091123.tar.bz2 25579 RMD160 4e956e66bedd944889c6b620a67c6a088c569bdb SHA1 dba1c3a2079cd96d5e2b8a06223ede21597ae958 SHA256 b4bebb8105d7ca083b1e3d96d23dea9f2170703d53b0ea75e09b428e73e43187 DIST mupen64plus-1.5-patches-20100507.tar.bz2 33484 RMD160 33d1a605c4e63de079cd0182410d8b7c4db85d11 SHA1 0b72e8b56d3bb50ff94dda0d608de8e48e5aca5e SHA256 372e437ab9d53eda23fd63cede33be38114efe527f239ef41b0c904fe208e2ce EBUILD mupen64plus-1.5-r1.ebuild 3339 RMD160 0143efeef1abf4554b0cd4d8d7eefb1ed63cf4c6 SHA1 e2aac6c26db762b52852f09745b8bea5293a8376 SHA256 f658780a3e24f8187958b17f375b679b22e32b02573db794bee8d9bfd07dc73b -EBUILD mupen64plus-1.5-r2.ebuild 3316 RMD160 62491c38dbbe0f2b5b8ab01bc1424b24baa48283 SHA1 8b5cc8288933da4d30f85978740c54b0fdde7a60 SHA256 cea2049a7efb0a8a9f7589cb3e5dc949e5201c21523951e4e57ac31d85bf1bdb -MISC ChangeLog 3381 RMD160 890773ad0c4a58dfde76fd2692c4460d16e4a7ac SHA1 1883f1173d3cad1b07f31ee8e517689e0a3ea293 SHA256 1e1de4eb01647d9c3f64fe5a8be7b69702920a2b16835db677f5ba9bf8cb4245 +EBUILD mupen64plus-1.5-r2.ebuild 3384 RMD160 06466e6cb7193df5e6d23c509a600352808844ee SHA1 8d895dd007b159162a52fa3abb28d32e29c71e43 SHA256 3cb71216d993271b75f729906164158c745e3fc8db3ace1c0a80d0f4a3a6ca4f +MISC ChangeLog 3661 RMD160 0c5e539efd6164883c462091fc938f28fb006de3 SHA1 064424ee88ee3c25c7edbfc302983e60f18aa8dc SHA256 2ae20bc5b3cc8b37c95521e25de6dc7ac528f18a88855bf0c0785daf6d01bc46 MISC metadata.xml 679 RMD160 a52b94f3dac0302970e9b6d9ead4341ca3722d5c SHA1 cddc937cadb60d9a67c578c815f192136b1dd701 SHA256 8cb8d6f4a9724cde575da81a562322e28c628a7bd7233de3424a3c001a006a2f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iF4EAREIAAYFAk59bykACgkQaC/OocHi7JbvswD9ES93PJu1PknUFM1F9kC0WKd4 -UurNK8/B/0QZmCyJp4sA/1fqV4IXWnthGzLJcaRmgwRwPJikaHR2my6e6jF1fsBG -=iiHT ------END PGP SIGNATURE----- diff --git a/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild index 81c08ac5f16a..e22ef4b3d5fd 100644 --- a/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild +++ b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild,v 1.3 2011/09/24 05:48:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild,v 1.4 2011/12/13 01:40:02 joker Exp $ EAPI="2" -inherit eutils flag-o-matic games +inherit eutils flag-o-matic games toolchain-funcs MY_P="Mupen64Plus-${PV/./-}-src" @@ -89,8 +89,9 @@ get_opts() { } src_compile() { + tc-export CC CXX use x86 && use sse && append-flags -fomit-frame-pointer - emake $(get_opts) DBGSYM=1 all || die "make failed" + emake $(get_opts) DBGSYM=1 CC="${CC}" CXX="${CXX}" LD="${CC}" all || die "make failed" } src_install() { |