summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorKarol Wojtaszek <sekretarz@gentoo.org>2006-08-07 07:51:37 +0000
committerKarol Wojtaszek <sekretarz@gentoo.org>2006-08-07 07:51:37 +0000
commita556d06f42513e9e96468059a6c655814ac60177 (patch)
treea82fb4ba4edaf93d606f65588f7e0b5db1e6ca83 /dev-db
parentVersion bump. (diff)
downloadgentoo-2-a556d06f42513e9e96468059a6c655814ac60177.tar.gz
gentoo-2-a556d06f42513e9e96468059a6c655814ac60177.tar.bz2
gentoo-2-a556d06f42513e9e96468059a6c655814ac60177.zip
Fixed compilation problem with gcc-4, bug #120867
(Portage version: 2.1.1_pre3)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/firebird/ChangeLog6
-rw-r--r--dev-db/firebird/files/digest-firebird-1.5.3-r13
-rw-r--r--dev-db/firebird/firebird-1.5.3-r1.ebuild10
3 files changed, 16 insertions, 3 deletions
diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index a5ddb87b2a24..98e4c1661c3b 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/firebird
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.44 2006/03/23 14:57:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.45 2006/08/07 07:51:37 sekretarz Exp $
+
+ 07 Aug 2006; Karol Wojtaszek <sekretarz@gentoo.org>
+ firebird-1.5.3-r1.ebuild:
+ Fixed compilation problem with gcc-4, bug #120867
23 Mar 2006; Aron Griffis <agriffis@gentoo.org> firebird-1.5.1.ebuild,
firebird-1.5.2.ebuild, firebird-1.5.3.ebuild, firebird-1.5.3-r1.ebuild:
diff --git a/dev-db/firebird/files/digest-firebird-1.5.3-r1 b/dev-db/firebird/files/digest-firebird-1.5.3-r1
index 3f2503307191..98428bd941ef 100644
--- a/dev-db/firebird/files/digest-firebird-1.5.3-r1
+++ b/dev-db/firebird/files/digest-firebird-1.5.3-r1
@@ -1,6 +1,9 @@
MD5 3690d389b3b69883f4bbc258b6c81851 Firebird-1.5-QuickStart.pdf 193637
RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f Firebird-1.5-QuickStart.pdf 193637
SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe Firebird-1.5-QuickStart.pdf 193637
+MD5 1100147a18b2127f6afd7083f829d62e firebird-1.5-gcc4.patch.bz2 21974
+RMD160 c7a348dd1fbd08813eebb9487716f4d1a5390576 firebird-1.5-gcc4.patch.bz2 21974
+SHA256 f48e1fbccae15b9367c432e46f06ea9a4b4059de5192386375733764c028776c firebird-1.5-gcc4.patch.bz2 21974
MD5 559d005ab6622274f9448687f930393c firebird-1.5.3.4870.tar.bz2 5055973
RMD160 3833574f8c2d996bfb06b346a5d22a88d9923425 firebird-1.5.3.4870.tar.bz2 5055973
SHA256 16880405d6e321a70e80c6e6fb4ed8429a692c43b8a7b59a676cf7d2162d2023 firebird-1.5.3.4870.tar.bz2 5055973
diff --git a/dev-db/firebird/firebird-1.5.3-r1.ebuild b/dev-db/firebird/firebird-1.5.3-r1.ebuild
index 1a96763d5bf9..646cc4c8feee 100644
--- a/dev-db/firebird/firebird-1.5.3-r1.ebuild
+++ b/dev-db/firebird/firebird-1.5.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.3-r1.ebuild,v 1.4 2006/03/23 14:57:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.3-r1.ebuild,v 1.5 2006/08/07 07:51:37 sekretarz Exp $
inherit flag-o-matic eutils
@@ -8,7 +8,8 @@ extra_ver="4870"
MY_P=${P}.${extra_ver}
DESCRIPTION="A relational database offering many ANSI SQL-99 features"
HOMEPAGE="http://firebird.sourceforge.net/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+ mirror://gentoo/${PN}-1.5-gcc4.patch.bz2
doc? ( http://firebird.sourceforge.net/pdfmanual/Firebird-1.5-QuickStart.pdf
ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
@@ -40,9 +41,14 @@ src_unpack() {
fi
unpack ${MY_P}.tar.bz2
+ unpack ${PN}-1.5-gcc4.patch.bz2
cd ${S}
epatch ${FILESDIR}/${PN}-1.5-build.patch
+ epatch ${WORKDIR}/${PN}-1.5-gcc4.patch
+
+ # This file must be regenerated during build
+ rm ${S}/src/dsql/parse.cpp
}
src_compile() {