diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2013-10-14 22:08:04 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2013-10-14 22:08:04 +0000 |
| commit | 1f3fbceddbad99bb0b2d7f5e570584d4cc51cd0a (patch) | |
| tree | 2f1310370a3bd138cf94b9dcb9a53d2f9352dd5a /games-util | |
| parent | Needs qt-4.8.5 or the postgres backend breaks horribly (diff) | |
| download | gentoo-2-1f3fbceddbad99bb0b2d7f5e570584d4cc51cd0a.tar.gz gentoo-2-1f3fbceddbad99bb0b2d7f5e570584d4cc51cd0a.tar.bz2 gentoo-2-1f3fbceddbad99bb0b2d7f5e570584d4cc51cd0a.zip | |
Respect AR/RANLIB, bug #477614
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 668310D9)
Diffstat (limited to 'games-util')
| -rw-r--r-- | games-util/xboxdrv/ChangeLog | 6 | ||||
| -rw-r--r-- | games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch | 13 | ||||
| -rw-r--r-- | games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild | 5 |
3 files changed, 22 insertions, 2 deletions
diff --git a/games-util/xboxdrv/ChangeLog b/games-util/xboxdrv/ChangeLog index b16ee234ee10..c2f28f41b5a8 100644 --- a/games-util/xboxdrv/ChangeLog +++ b/games-util/xboxdrv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-util/xboxdrv # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/ChangeLog,v 1.32 2013/07/27 22:23:37 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/ChangeLog,v 1.33 2013/10/14 22:08:04 tristan Exp $ + + 14 Oct 2013; Tristan Heaven <tristan@gentoo.org> xboxdrv-0.8.5-r1.ebuild, + +files/xboxdrv-0.8.5-scons.patch: + Respect AR/RANLIB, bug #477614 27 Jul 2013; Agostino Sarubbo <ago@gentoo.org> xboxdrv-0.8.5-r1.ebuild: Stable for x86, wrt bug #477430 diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch b/games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch new file mode 100644 index 000000000000..cb81f6d51470 --- /dev/null +++ b/games-util/xboxdrv/files/xboxdrv-0.8.5-scons.patch @@ -0,0 +1,13 @@ +http://dev.gentoo.org/~vapier/scons-blows.txt + +--- SConstruct ++++ SConstruct +@@ -85,6 +85,8 @@ + opts.Add('LINKFLAGS', 'Linker Compiler flags') + opts.Add('CC', 'C Compiler') + opts.Add('CXX', 'C++ Compiler') ++opts.Add('AR', 'Archiver') ++opts.Add('RANLIB', 'Archive indexer') + opts.Add('BUILD', 'Build type: release, custom, development') + + opts.Update(env) diff --git a/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild b/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild index d7f1ff3f53bc..9c53f26d1d9f 100644 --- a/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild +++ b/games-util/xboxdrv/xboxdrv-0.8.5-r1.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-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild,v 1.3 2013/07/27 22:23:37 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.8.5-r1.ebuild,v 1.4 2013/10/14 22:08:04 tristan Exp $ EAPI=5 inherit base linux-info scons-utils toolchain-funcs @@ -27,11 +27,14 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD" +PATCHES=( "${FILESDIR}"/${P}-scons.patch ) src_compile() { escons \ BUILD=custom \ CXX="$(tc-getCXX)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ CXXFLAGS="-Wall ${CXXFLAGS}" \ LINKFLAGS="${LDFLAGS}" } |