diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2008-04-09 21:34:50 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2008-04-09 21:34:50 +0000 |
| commit | 3f02f4358969df53f912560d1932fc9e0ff5b39a (patch) | |
| tree | 2fd188d1f009d160092cea71cb23a2f821430c58 /dev-games/ogre | |
| parent | bump to 2.22.1. Remove shebangs from non-executable Python scripts and (diff) | |
| download | gentoo-2-3f02f4358969df53f912560d1932fc9e0ff5b39a.tar.gz gentoo-2-3f02f4358969df53f912560d1932fc9e0ff5b39a.tar.bz2 gentoo-2-3f02f4358969df53f912560d1932fc9e0ff5b39a.zip | |
alternate fix for --as-needed from James Le Cuirot
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-games/ogre')
| -rw-r--r-- | dev-games/ogre/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/ogre/files/ogre-1.4.7-as-needed.patch | 11 | ||||
| -rw-r--r-- | dev-games/ogre/ogre-1.4.7.ebuild | 11 |
3 files changed, 20 insertions, 8 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog index 36d308371729..ac1853214ce8 100644 --- a/dev-games/ogre/ChangeLog +++ b/dev-games/ogre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/ogre # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.47 2008/04/08 16:47:44 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.48 2008/04/09 21:34:50 mr_bones_ Exp $ + + 09 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org> + +files/ogre-1.4.7-as-needed.patch, ogre-1.4.7.ebuild: + alternate fix for --as-needed from James Le Cuirot 08 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.4.7.ebuild: fix --as-needed when USE=cg - patch from James Le Cuirot via bug #215085 diff --git a/dev-games/ogre/files/ogre-1.4.7-as-needed.patch b/dev-games/ogre/files/ogre-1.4.7-as-needed.patch new file mode 100644 index 000000000000..ce218097f770 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.4.7-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) + fi + + AM_CONDITIONAL(BUILD_CGPLUGIN, test x$build_cg = xyes) diff --git a/dev-games/ogre/ogre-1.4.7.ebuild b/dev-games/ogre/ogre-1.4.7.ebuild index 0a1af5ec6a72..8c825abcc5a6 100644 --- a/dev-games/ogre/ogre-1.4.7.ebuild +++ b/dev-games/ogre/ogre-1.4.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.7.ebuild,v 1.2 2008/04/08 16:47:44 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.7.ebuild,v 1.3 2008/04/09 21:34:50 mr_bones_ Exp $ inherit eutils autotools flag-o-matic @@ -35,8 +35,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/ogrenew pkg_setup() { - if use threads && has_version "<dev-libs/boost-1.34" && \ - ! built_with_use dev-libs/boost threads + if use threads && ! built_with_use --missing true dev-libs/boost threads then die "Please emerge dev-libs/boost with USE=threads" fi @@ -53,14 +52,12 @@ src_unpack() { -name bin -o -name '*.cbp' -o -name '*.vcproj*' ')' \ -print0 | xargs -0 rm -rf fi - sed -i '/CPPUNIT/d' configure.in || die "sed failed" - epatch "${FILESDIR}"/${P}-cegui.patch + sed -i -e '/CPPUNIT/d' configure.in || die "sed failed" + epatch "${FILESDIR}"/${P}-*.patch eautoreconf } src_compile() { - use cg && filter-ldflags -Wl,--as-needed - econf \ --disable-dependency-tracking \ --disable-freeimage \ |