summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-12-14 02:33:36 +0000
committerMike Frysinger <vapier@gentoo.org>2004-12-14 02:33:36 +0000
commit7dbb5244e6e98427cb0123e93c8aeae205abe1dc (patch)
treec42328723f6f6bb2f39ffbd7d90f42462d7ce957
parentFix for libtool problem due to version mismatches. Thanks to DHUNCAN for prod... (diff)
downloadgentoo-2-7dbb5244e6e98427cb0123e93c8aeae205abe1dc.tar.gz
gentoo-2-7dbb5244e6e98427cb0123e93c8aeae205abe1dc.tar.bz2
gentoo-2-7dbb5244e6e98427cb0123e93c8aeae205abe1dc.zip
Update patch to be cross-compile friendly.
-rw-r--r--sys-libs/db/ChangeLog5
-rw-r--r--sys-libs/db/db-1.85-r2.ebuild15
-rw-r--r--sys-libs/db/files/digest-db-1.85-r22
3 files changed, 13 insertions, 9 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index bd3f017233df..55e350d0aa6e 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/db
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.107 2004/12/08 15:51:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.108 2004/12/14 02:33:36 vapier Exp $
+
+ 13 Dec 2004; Mike Frysinger <vapier@gentoo.org> db-1.85-r2.ebuild:
+ Update patch to be cross-compile friendly.
08 Dec 2004; Simon Stelling <blubb@gentoo.org>
+files/db-4.2-libtool.patch, db-4.2.52_p2.ebuild:
diff --git a/sys-libs/db/db-1.85-r2.ebuild b/sys-libs/db/db-1.85-r2.ebuild
index 33cfcaf8b446..130d8a7901cc 100644
--- a/sys-libs/db/db-1.85-r2.ebuild
+++ b/sys-libs/db/db-1.85-r2.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r2.ebuild,v 1.4 2004/11/12 14:53:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r2.ebuild,v 1.5 2004/12/14 02:33:36 vapier Exp $
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="db 1.85 -- required for RPM 4.0 to compile; that's about it."
HOMEPAGE="http://www.sleepycat.com/"
SRC_URI="http://www.sleepycat.com/update/snapshot/db.${PV}.tar.gz
- mirror://gentoo/db.${PV}.patch.gz"
+ mirror://gentoo/${P}.patch.bz2"
LICENSE="DB"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86"
IUSE=""
DEPEND="virtual/libc"
@@ -21,15 +21,16 @@ S=${WORKDIR}/db.${PV}
src_unpack() {
unpack ${A}
cd ${S}
- epatch ${DISTDIR}/db.${PV}.patch.gz
+ epatch ${WORKDIR}/${P}.patch
}
src_compile() {
cd ${S}/PORT/linux
- make ${MAKEOPTS} OORG="${CFLAGS}" prefix=/usr || die
+ tc-export CC AR RANLIB
+ emake OORG="${CFLAGS}" prefix=/usr || die
}
-src_install () {
+src_install() {
cd ${S}/PORT/linux
newlib.a libdb.a libdb1.a || die "newlib.a failed"
diff --git a/sys-libs/db/files/digest-db-1.85-r2 b/sys-libs/db/files/digest-db-1.85-r2
index d9711499dffd..617fd6a1bee9 100644
--- a/sys-libs/db/files/digest-db-1.85-r2
+++ b/sys-libs/db/files/digest-db-1.85-r2
@@ -1,2 +1,2 @@
MD5 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz 270953
-MD5 8c9ba7727f3e8ab164805885171e3052 db.1.85.patch.gz 16756
+MD5 8fb6e2d39bc77fc8521401522ceeebaf db-1.85.patch.bz2 15277