summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-09-20 03:47:35 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-09-20 03:47:35 +0000
commitcb53b76af1de55c6cb5080e1b8b4c6dd5387256b (patch)
tree094467e6d92156b1b0801b2d22841e164654fab7 /dev-games
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-cb53b76af1de55c6cb5080e1b8b4c6dd5387256b.tar.gz
gentoo-2-cb53b76af1de55c6cb5080e1b8b4c6dd5387256b.tar.bz2
gentoo-2-cb53b76af1de55c6cb5080e1b8b4c6dd5387256b.zip
fix build with /bin/sh != bash (bug #335760); add USE=static-libs
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/ode/ChangeLog5
-rw-r--r--dev-games/ode/ode-0.11.1.ebuild11
2 files changed, 13 insertions, 3 deletions
diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog
index 495f90e0529f..5d30319233d7 100644
--- a/dev-games/ode/ChangeLog
+++ b/dev-games/ode/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-games/ode
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.57 2010/09/17 11:03:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.58 2010/09/20 03:47:35 mr_bones_ Exp $
+
+ 20 Sep 2010; Michael Sterrett <mr_bones_@gentoo.org> ode-0.11.1.ebuild:
+ fix build with /bin/sh != bash (bug #335760); add USE=static-libs
17 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> ode-0.11.1.ebuild:
Remove virtual/glu where already virtual/opengl is stated.
diff --git a/dev-games/ode/ode-0.11.1.ebuild b/dev-games/ode/ode-0.11.1.ebuild
index 1c77eac32620..f0bacf039665 100644
--- a/dev-games/ode/ode-0.11.1.ebuild
+++ b/dev-games/ode/ode-0.11.1.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/ode/ode-0.11.1.ebuild,v 1.6 2010/09/17 11:03:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.11.1.ebuild,v 1.7 2010/09/20 03:47:35 mr_bones_ Exp $
EAPI=2
DESCRIPTION="Open Dynamics Engine SDK"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/opende/${P}.tar.bz2"
LICENSE="|| ( LGPL-2.1 BSD )"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug doc double-precision examples gyroscopic"
+IUSE="debug doc double-precision examples gyroscopic static-libs"
RDEPEND="examples? (
virtual/opengl
@@ -27,9 +27,12 @@ src_prepare() {
}
src_configure() {
+ # use bash (bug #335760)
+ CONFIG_SHELL=/bin/bash \
econf \
--disable-dependency-tracking \
--enable-shared \
+ $(use_enable static-libs static) \
$(use_enable debug asserts) \
$(use_enable double-precision) \
$(use_enable examples demos) \
@@ -48,6 +51,10 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
dodoc CHANGELOG.txt README.txt
+ if ! use static-libs ; then
+ find "${D}" -type f -name '*.la' -exec rm {} + \
+ || die "la removal failed"
+ fi
if use doc ; then
dohtml docs/* || die "dohtml failed"
fi