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
commit9fed3ab643f1496999156c9f91daf792841ce862 (patch)
treed62cf24ec426ff2e12a4131d6648394a5beb5b7a /dev-games/ode
parentAutomated update of use.local.desc (diff)
downloadhistorical-9fed3ab643f1496999156c9f91daf792841ce862.tar.gz
historical-9fed3ab643f1496999156c9f91daf792841ce862.tar.bz2
historical-9fed3ab643f1496999156c9f91daf792841ce862.zip
fix build with /bin/sh != bash (bug #335760); add USE=static-libs
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'dev-games/ode')
-rw-r--r--dev-games/ode/ChangeLog5
-rw-r--r--dev-games/ode/Manifest4
-rw-r--r--dev-games/ode/ode-0.11.1.ebuild11
3 files changed, 15 insertions, 5 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/Manifest b/dev-games/ode/Manifest
index fb174be1beb7..082afed22b26 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -1,4 +1,4 @@
DIST ode-0.11.1.tar.bz2 1720088 RMD160 cfbfb448446361e9c27c8e3bd27a8ae0850234d6 SHA1 5accd341c6b36835d49beb927e39272bf7886962 SHA256 877884a86a3d53f3c5f2e35fbd8a3dc23c20249f0636c76f6ef41f6bf57a03a1
-EBUILD ode-0.11.1.ebuild 1734 RMD160 27c2bc838a0d4ab4f90532980558b422451cdaeb SHA1 65a10f75ad0e106e84795d68c36dd8c2a12fd553 SHA256 ae243e2357a76350a80556d9e1c3b3c038f90461884a8542377611e9e760a7e7
-MISC ChangeLog 7724 RMD160 6ff14041c8de4c28fee7f398ec9f5cf773cd4a56 SHA1 c67967c8828b8719d6682fc2699c7c628ad10f7d SHA256 c726f30fc005157a5de61a9882402ab7a27a156ba4ef3b6845d56428f3f5bdb2
+EBUILD ode-0.11.1.ebuild 1949 RMD160 0a4dd5a7e5715ef14368ee5aba679d4573295be2 SHA1 3a231a71e5451fad7f88cbec1fba5ad41753d2f3 SHA256 38b8f2fbafdd4bb7761da064451ea8189b925e9377a32d8c78505be1297e6e05
+MISC ChangeLog 7867 RMD160 e602935c51b4d5608bf985d0d8c9fa7acb25f059 SHA1 0a0ef4bb20f83919b6d0fda0d73fd4f5b42744c4 SHA256 1807ac39f9a2a3d636ac31f3795b8a034e693895ea6fc47c66555db1e4b76a9b
MISC metadata.xml 700 RMD160 01bbd003b128c29e1b005a37cc6d446311d8816a SHA1 f27d8eca818af3fae14be63b61574ebe571b9d34 SHA256 44d20050da15d76be2e2eabb702458a32f3885ab668a92054c0f91be59d42726
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