ssuominen 09/08/06 14:57:11
Modified: openinventor-2.1.5.10-r3.ebuild ChangeLog
Log:
Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277081.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Revision Changes Path
1.6 media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild?r1=1.5&r2=1.6
Index: openinventor-2.1.5.10-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openinventor-2.1.5.10-r3.ebuild 7 Feb 2009 21:11:28 -0000 1.5
+++ openinventor-2.1.5.10-r3.ebuild 6 Aug 2009 14:57:11 -0000 1.6
@@ -1,11 +1,12 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild,v 1.5 2009/02/07 21:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild,v 1.6 2009/08/06 14:57:11 ssuominen Exp $
+EAPI=2
inherit eutils versionator flag-o-matic toolchain-funcs
MY_PV=$(replace_version_separator 3 '-')
-MY_PN="inventor"
+MY_PN=inventor
DESCRIPTION="SGI OpenInventor Toolkit and Utilities"
HOMEPAGE="http://oss.sgi.com/projects/inventor/"
@@ -16,25 +17,15 @@
KEYWORDS="alpha amd64 sparc x86"
IUSE=""
-RDEPEND="media-libs/mesa
+RDEPEND="media-libs/mesa[motif]
x11-libs/openmotif
>=media-libs/jpeg-6b
>=media-libs/freetype-2.0
media-fonts/corefonts"
-DEPEND="dev-util/byacc
- ${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-util/byacc"
-S="${WORKDIR}/${MY_PN}"
-
-pkg_setup() {
- if ! built_with_use media-libs/mesa motif; then
- echo
- eerror "In order to compile openinventor, you need to have media-libs/mesa emerged"
- eerror "with 'motif' in your USE flags. Please add that flag, re-emerge"
- eerror "media-libs/mesa, and then emerge openinventor"
- die "media-libs/mesa is missing motif"
- fi
-}
+S=${WORKDIR}/${MY_PN}
src_unpack() {
unpack ${A}
@@ -57,6 +48,8 @@
# fix bug #251681
epatch "${FILESDIR}"/bug-251681.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+
# respect CC etc
sed -i \
-e "s:CC = /usr/bin/gcc:CC = $(tc-getCC):g" \
1.28 media-libs/openinventor/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/openinventor/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/openinventor/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/openinventor/ChangeLog?r1=1.27&r2=1.28
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/openinventor/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog 7 Feb 2009 21:11:28 -0000 1.27
+++ ChangeLog 6 Aug 2009 14:57:11 -0000 1.28
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/openinventor
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/ChangeLog,v 1.27 2009/02/07 21:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/ChangeLog,v 1.28 2009/08/06 14:57:11 ssuominen Exp $
+
+ 06 Aug 2009; Samuli Suominen <ssuominen@g.o>
+ openinventor-2.1.5.10-r3.ebuild,
+ +files/openinventor-2.1.5.10-glibc-2.10.patch:
+ Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277081.
07 Feb 2009; Markus Meier <maekke@g.o>
openinventor-2.1.5.10-r3.ebuild:
|
