summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-12-16 03:01:44 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-12-16 03:01:44 +0000
commit817e518c5384e5358864afe65417e34028bee610 (patch)
tree87f13f21cae440366fb298226c821e491c5f1012 /dev-libs
parentonly depend on libtool if not in bootstrap (diff)
downloadgentoo-2-817e518c5384e5358864afe65417e34028bee610.tar.gz
gentoo-2-817e518c5384e5358864afe65417e34028bee610.tar.bz2
gentoo-2-817e518c5384e5358864afe65417e34028bee610.zip
get it to work with multi spec gcc versions (currently gcc-3.2.1-r5 ..)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/STLport/ChangeLog7
-rw-r--r--dev-libs/STLport/STLport-4.5.3-r2.ebuild19
2 files changed, 21 insertions, 5 deletions
diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index 7f0470ee1396..deaaf0bbab87 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/STLport
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.8 2002/12/13 10:56:29 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.9 2002/12/16 03:01:44 azarah Exp $
+
+ 16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> STLport-4.5.3-r2.ebuild :
+
+ Only apply the gcc3 g++-v3? patches if we do not use the multi spec gcc
+ ebuild ...
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
diff --git a/dev-libs/STLport/STLport-4.5.3-r2.ebuild b/dev-libs/STLport/STLport-4.5.3-r2.ebuild
index b6ab82ed2a2d..fed39a77f20f 100644
--- a/dev-libs/STLport/STLport-4.5.3-r2.ebuild
+++ b/dev-libs/STLport/STLport-4.5.3-r2.ebuild
@@ -1,8 +1,12 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-4.5.3-r2.ebuild,v 1.4 2002/12/09 04:20:59 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-4.5.3-r2.ebuild,v 1.5 2002/12/16 03:01:44 azarah Exp $
-S=${WORKDIR}/${P}
+IUSE=""
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
DESCRIPTION="C++ STL library"
SRC_URI="http://www.stlport.org/archive/${P}.tar.gz"
HOMEPAGE="http://www.stlport.org"
@@ -16,9 +20,15 @@ LICENSE="as-is"
src_unpack() {
unpack ${A}
+
cd ${S}
- patch -p1 < ${FILESDIR}/${P}-gcc3.patch2 || die "Patching failed"
- patch -p1 < ${FILESDIR}/${P}-optimize.patch || die "Patching failed"
+ # Do we use the new multi scheme gcc ?
+ if ! /usr/sbin/gcc-config --get-current-profile &> /dev/null
+ then
+ epatch ${FILESDIR}/${P}-gcc3.patch2
+ fi
+
+ epatch ${FILESDIR}/${P}-optimize.patch
}
src_compile() {
@@ -42,3 +52,4 @@ src_install () {
cd ${S}
dohtml -r doc
}
+