diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-12-01 17:22:21 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-12-01 17:22:21 +0000 |
| commit | b9c0e94853c5d499216e29cfe516eb02251d20e7 (patch) | |
| tree | 1c90c0fcdffef74e4f516d18eada56750fc9da46 /dev-games/ogre | |
| parent | Adjust Asterisk dependency in preparation for 1.4 ebuilds. (diff) | |
| download | gentoo-2-b9c0e94853c5d499216e29cfe516eb02251d20e7.tar.gz gentoo-2-b9c0e94853c5d499216e29cfe516eb02251d20e7.tar.bz2 gentoo-2-b9c0e94853c5d499216e29cfe516eb02251d20e7.zip | |
fix patching for as-needed to fit the naming convention (bug #347377)
(Portage version: 2.1.9.24/cvs/Linux i686)
Diffstat (limited to 'dev-games/ogre')
| -rw-r--r-- | dev-games/ogre/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/ogre/files/ogre-1.6.5-as-needed.patch | 11 | ||||
| -rw-r--r-- | dev-games/ogre/ogre-1.6.5.ebuild | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog index 968f03d39c83..e94ae20ae164 100644 --- a/dev-games/ogre/ChangeLog +++ b/dev-games/ogre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/ogre # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.69 2010/10/15 17:44:32 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.70 2010/12/01 17:22:21 mr_bones_ Exp $ + + 01 Dec 2010; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.6.5.ebuild, + +files/ogre-1.6.5-as-needed.patch: + fix patching for as-needed to fit the naming convention (bug #347377) 15 Oct 2010; Christian Faulhammer <fauli@gentoo.org> ogre-1.6.5.ebuild: stable x86, bug 340925 diff --git a/dev-games/ogre/files/ogre-1.6.5-as-needed.patch b/dev-games/ogre/files/ogre-1.6.5-as-needed.patch new file mode 100644 index 000000000000..11ccb571776a --- /dev/null +++ b/dev-games/ogre/files/ogre-1.6.5-as-needed.patch @@ -0,0 +1,11 @@ +--- acinclude.m4.orig 2008-04-09 17:49:30.848987000 +0100 ++++ acinclude.m4 2008-04-09 17:53:25.652068359 +0100 +@@ -340,7 +340,7 @@ + * --disable-cg to this configure script but this is highly * + * discouraged as this breaks many of the examples. * + ****************************************************************]) +- ) ++ ,-Xlinker --no-as-needed -lstdc++) + fi + + AM_CONDITIONAL(BUILD_CGPLUGIN, test x$build_cg = xyes) diff --git a/dev-games/ogre/ogre-1.6.5.ebuild b/dev-games/ogre/ogre-1.6.5.ebuild index 147093964a5f..a51260d7ecbf 100644 --- a/dev-games/ogre/ogre-1.6.5.ebuild +++ b/dev-games/ogre/ogre-1.6.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.7 2010/10/15 17:44:32 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.8 2010/12/01 17:22:21 mr_bones_ Exp $ EAPI=2 inherit multilib eutils autotools flag-o-matic @@ -51,7 +51,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-boost.patch \ "${FILESDIR}"/${P}-automake.patch \ "${FILESDIR}"/${P}-cegui.patch \ - "${FILESDIR}"/${PN}-1.4.9-as-needed.patch + "${FILESDIR}"/${P}-as-needed.patch eautoreconf } |