diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2007-02-03 19:17:34 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2007-02-03 19:17:34 +0000 |
| commit | a710e5426d0d17a8b1272bf3a1eee424b52c865e (patch) | |
| tree | 428189fc792ac7a6134206a9c9f04092ca4126f3 | |
| parent | Mask media-sound/choad for removal. (diff) | |
| download | gentoo-2-a710e5426d0d17a8b1272bf3a1eee424b52c865e.tar.gz gentoo-2-a710e5426d0d17a8b1272bf3a1eee424b52c865e.tar.bz2 gentoo-2-a710e5426d0d17a8b1272bf3a1eee424b52c865e.zip | |
fix multilib-strict bug 154426
(Portage version: 2.1.2-r5)
| -rw-r--r-- | dev-games/ode/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/ode/files/ode-0.7-libdir.patch | 11 | ||||
| -rw-r--r-- | dev-games/ode/ode-0.7.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog index fe3fac9eb193..e4e7d28f57fb 100644 --- a/dev-games/ode/ChangeLog +++ b/dev-games/ode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/ode # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.35 2007/01/06 01:46:56 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.36 2007/02/03 19:17:34 blubb Exp $ + + 03 Feb 2007; Simon Stelling <blubb@gentoo.org> + +files/ode-0.7-libdir.patch, ode-0.7.ebuild: + fix multilib-strict bug 154426 06 Jan 2007; Tristan Heaven <nyhm@gentoo.org> ode-0.6-r1.ebuild: Set WANT_AUTOCONF and WANT_AUTOMAKE diff --git a/dev-games/ode/files/ode-0.7-libdir.patch b/dev-games/ode/files/ode-0.7-libdir.patch new file mode 100644 index 000000000000..c05f6918c899 --- /dev/null +++ b/dev-games/ode/files/ode-0.7-libdir.patch @@ -0,0 +1,11 @@ +--- ode/src/Makefile.am.orig 2007-02-03 20:09:21.000000000 +0100 ++++ ode/src/Makefile.am 2007-02-03 20:09:31.000000000 +0100 +@@ -11,7 +11,7 @@ + # Fake an executable in order to get a shared library + # Note the elegant and cunning way to trick Autotools to install a program + # in a lib directory. --Rodrigo +-traplibdir=$(prefix)/lib ++traplibdir=$(prefix)/$(libdir) + EXEEXT=@so_ext@ + traplib_PROGRAMS=libode + libode_SOURCES= diff --git a/dev-games/ode/ode-0.7.ebuild b/dev-games/ode/ode-0.7.ebuild index bbebe1ea0a18..8c8c9d5f4dad 100644 --- a/dev-games/ode/ode-0.7.ebuild +++ b/dev-games/ode/ode-0.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.7.ebuild,v 1.2 2006/10/30 10:11:06 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.7.ebuild,v 1.3 2007/02/03 19:17:34 blubb Exp $ WANT_AUTOCONF=latest WANT_AUTOMAKE=latest @@ -32,6 +32,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-flags.patch + epatch "${FILESDIR}"/${P}-libdir.patch eautoreconf sed -i -e "s/..\/..\/drawstuff\/textures/\/usr\/share\/${PF}\/examples/" ode/test/*.c* |