diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2008-06-20 01:42:02 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2008-06-20 01:42:02 +0000 |
| commit | 05268ed33a4873b353656b58c01839e327f428fc (patch) | |
| tree | 7db474ac9072eb8f634cf4df42ae0ebe5ac2380e /dev-games/ode | |
| parent | Regenerate digest (diff) | |
| download | gentoo-2-05268ed33a4873b353656b58c01839e327f428fc.tar.gz gentoo-2-05268ed33a4873b353656b58c01839e327f428fc.tar.bz2 gentoo-2-05268ed33a4873b353656b58c01839e327f428fc.zip | |
Add patch to avoid silly sed on generated file (bug #226431)
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-games/ode')
| -rw-r--r-- | dev-games/ode/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/ode/files/ode-0.9-destdir.patch | 18 | ||||
| -rw-r--r-- | dev-games/ode/ode-0.9.ebuild | 15 |
3 files changed, 29 insertions, 10 deletions
diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog index 55d6a1f22af5..cbf1f68bbe08 100644 --- a/dev-games/ode/ChangeLog +++ b/dev-games/ode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/ode # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.46 2008/02/24 09:45:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.47 2008/06/20 01:42:01 mr_bones_ Exp $ + + 20 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org> + +files/ode-0.9-destdir.patch, ode-0.9.ebuild: + Add patch to avoid silly sed on generated file (bug #226431) 24 Feb 2008; Mike Frysinger <vapier@gentoo.org> +files/ode-0.9-x-flags.patch, ode-0.9.ebuild: diff --git a/dev-games/ode/files/ode-0.9-destdir.patch b/dev-games/ode/files/ode-0.9-destdir.patch new file mode 100644 index 000000000000..594d5c7ff925 --- /dev/null +++ b/dev-games/ode/files/ode-0.9-destdir.patch @@ -0,0 +1,18 @@ +--- Makefile.am.orig 2008-06-19 20:26:58.000000000 -0400 ++++ Makefile.am 2008-06-19 20:28:10.000000000 -0400 +@@ -26,12 +26,11 @@ + if USE_SONAME + install-exec-hook: + ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ +- $(libdir)/libode.so ++ $(DESTDIR)$(libdir)/libode.so + ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ +- $(libdir)/@ODE_SONAME@ ++ $(DESTDIR)$(libdir)/@ODE_SONAME@ + ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ +- $(libdir)/@ODE_SONAME@.@ODE_REVISION@ +- /sbin/ldconfig ++ $(DESTDIR)$(libdir)/@ODE_SONAME@.@ODE_REVISION@ + else + install-exec-hook: + endif diff --git a/dev-games/ode/ode-0.9.ebuild b/dev-games/ode/ode-0.9.ebuild index 3ab1a9830006..2c53c542766b 100644 --- a/dev-games/ode/ode-0.9.ebuild +++ b/dev-games/ode/ode-0.9.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/ode/ode-0.9.ebuild,v 1.2 2008/02/24 09:45:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.9.ebuild,v 1.3 2008/06/20 01:42:01 mr_bones_ Exp $ inherit eutils autotools @@ -29,8 +29,11 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-flags.patch - epatch "${FILESDIR}"/${P}-x-flags.patch + epatch \ + "${FILESDIR}"/${P}-flags.patch \ + "${FILESDIR}"/${P}-x-flags.patch \ + "${FILESDIR}"/${P}-destdir.patch + eautoreconf sed -i \ @@ -45,12 +48,6 @@ src_unpack() { -e "s/inline_[\t]*void[\t*]ResetCountDown/void ResetCountDown/" \ OPCODE/OPC_TreeCollider.h \ || die "sed failed" - sed -i \ - -e '/USE_SONAME_TRUE/s:\(\$(libdir)\):$(DESTDIR)\1:' \ - -e '/USE_SONAME_TRUE.*ldconfig/d' \ - -e '/USE_SONAME_TRUE.*ln -s/s:\$(DESTDIR)::' \ - Makefile.in \ - || die "sed failed" } src_compile() { |