diff options
author | Ned Ludd <solar@gentoo.org> | 2004-06-25 16:18:30 +0000 |
---|---|---|
committer | Ned Ludd <solar@gentoo.org> | 2004-06-25 16:18:30 +0000 |
commit | 640a83488beeac777a069889d67659c11cfe19ed (patch) | |
tree | a6aaeba66853c3c4ebeb7fad78127a5af868827c /sys-libs | |
parent | glibc ----------------------------> libc ! (Manifest recommit) (diff) | |
download | gentoo-2-640a83488beeac777a069889d67659c11cfe19ed.tar.gz gentoo-2-640a83488beeac777a069889d67659c11cfe19ed.tar.bz2 gentoo-2-640a83488beeac777a069889d67659c11cfe19ed.zip |
uclibc update
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/db/ChangeLog | 5 | ||||
-rw-r--r-- | sys-libs/db/Manifest | 4 | ||||
-rw-r--r-- | sys-libs/db/db-4.1.25_p1-r4.ebuild | 14 |
3 files changed, 16 insertions, 7 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog index b17a7a9e9c98..b1be8b8e0ab0 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.93 2004/06/24 23:03:02 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.94 2004/06/25 16:18:30 solar Exp $ + + 25 Jun 2004; <solar@gentoo.org> db-4.1.25_p1-r4.ebuild: + uclibc update *db-4.1.25_p1-r4 (19 Jun 2004) diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index cccf122e0d4c..c74437905d56 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -1,6 +1,6 @@ MD5 b66d4d8d38e28ac7dbdcfe6b5da8032e db-3.3.11.ebuild 2403 MD5 f4fb5b01541980d1272802f3462495bb db-4.0.14-r3.ebuild 2370 -MD5 c32db141c1e99b93e8298aa94b959878 db-4.1.25_p1-r4.ebuild 2764 +MD5 250602f804ba12f92d53e85e56add5bf db-4.1.25_p1-r4.ebuild 2905 MD5 4edc653ef33abe7f2d8239b8f263ae32 db-3.2.9-r10.ebuild 4156 MD5 2f493a7fbae4580425a2d6fed004f87d db-1.85-r1.ebuild 1403 MD5 d283981a560da94632d4e31471f431e1 db-4.0.14-r2.ebuild 2123 @@ -8,7 +8,7 @@ MD5 ac391e9ed0bb59471299935a61443f44 db-4.2.52_p2.ebuild 2750 MD5 09f0970903ae2de92723dd754548cf86 db-4.1.25_p1-r3.ebuild 2640 MD5 967cf176a32dc4d491f991139cb3ec3c db-3.2.9-r7.ebuild 4353 MD5 df8898850868e91beb34f64a3d1af3de db-3.2.9-r9.ebuild 3486 -MD5 c9ebc2abd7864df65f574cdad89464cd ChangeLog 14832 +MD5 76e7b7bfd13ca4b9469c24d285349461 ChangeLog 14907 MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457 MD5 2dba08d2903cb08c732eb823a8a688ba db-4.2.52_p1.ebuild 2755 MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492 diff --git a/sys-libs/db/db-4.1.25_p1-r4.ebuild b/sys-libs/db/db-4.1.25_p1-r4.ebuild index b2c1ef5c7be7..ed0f15ce6019 100644 --- a/sys-libs/db/db-4.1.25_p1-r4.ebuild +++ b/sys-libs/db/db-4.1.25_p1-r4.ebuild @@ -1,6 +1,6 @@ # 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-4.1.25_p1-r4.ebuild,v 1.4 2004/06/24 23:03:02 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.5 2004/06/25 16:18:30 solar Exp $ inherit eutils gnuconfig db @@ -54,15 +54,20 @@ src_compile() { # Mips needs a gnuconfig update so obscure things like mips64 are known # db-4.1.25_p1 extracts to ${WORKDIR}/db-4.1.25, so we need to strip the _p1 if use mips || use uclibc ; then - einfo "Updating config.{guess,sub} for mips" + einfo "Updating config.{guess,sub} for mips or uclibc" local OLDS="${S}" S="${S}/../dist" gnuconfig_update S="${OLDS}" fi + use uclibc \ + && local myconf="--disable-rpc" \ + || local myconf="--enable-rpc" - use uclibc && local myconf="--disable-rpc" || local myconf="--enable-rpc" + use uclibc \ + && myconf="${myconf} --disable-cxx" \ + || myconf="${myconf} --enable-cxx" use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly" @@ -89,7 +94,6 @@ src_compile() { --sysconfdir=/etc \ --localstatedir=/var/lib \ --enable-compat185 \ - --enable-cxx \ --with-uniquename \ --host=${CHOST} \ ${myconf} || die @@ -111,6 +115,8 @@ src_install () { dodir /usr/sbin mv ${D}/usr/bin/berkeley_db_svc ${D}/usr/sbin/berkeley_db41_svc + + use uclibc && rm -f ${D}/usr/include/db*/*cxx* } pkg_postinst () { |