summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-12-16 10:29:20 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-12-16 10:29:20 +0000
commit5076048e9bb6a543c8f597c7c2ec837528b0e7f4 (patch)
tree7cd4e21a0ff337e84bb980ecce8a56c8083deeb5 /sys-libs/db
parentStable on amd64. (Manifest recommit) (diff)
downloadgentoo-2-5076048e9bb6a543c8f597c7c2ec837528b0e7f4.tar.gz
gentoo-2-5076048e9bb6a543c8f597c7c2ec837528b0e7f4.tar.bz2
gentoo-2-5076048e9bb6a543c8f597c7c2ec837528b0e7f4.zip
get_libdir support for multilib archs.
Diffstat (limited to 'sys-libs/db')
-rw-r--r--sys-libs/db/ChangeLog8
-rw-r--r--sys-libs/db/db-1.85-r1.ebuild10
-rw-r--r--sys-libs/db/db-1.85-r2.ebuild10
-rw-r--r--sys-libs/db/db-3.2.9-r10.ebuild7
-rw-r--r--sys-libs/db/db-3.2.9-r7.ebuild10
-rw-r--r--sys-libs/db/db-4.0.14-r2.ebuild7
-rw-r--r--sys-libs/db/db-4.0.14-r3.ebuild7
-rw-r--r--sys-libs/db/db-4.1.25_p1-r3.ebuild5
-rw-r--r--sys-libs/db/db-4.1.25_p1-r4.ebuild5
-rw-r--r--sys-libs/db/db-4.2.52_p1.ebuild7
-rw-r--r--sys-libs/db/db-4.2.52_p2.ebuild5
11 files changed, 49 insertions, 32 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 2f61ebd04e09..fb4e0588894d 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,12 @@
# 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.109 2004/12/14 16:21:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.110 2004/12/16 10:29:20 eradicator Exp $
+
+ 16 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> db-1.85-r1.ebuild,
+ db-1.85-r2.ebuild, db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild,
+ db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild,
+ db-4.1.25_p1-r4.ebuild, db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild:
+ get_libdir support for multilib archs.
14 Dec 2004; Dylan Carlson <absinthe@gentoo.org> db-4.1.25_p1-r4.ebuild:
Stable on amd64.
diff --git a/sys-libs/db/db-1.85-r1.ebuild b/sys-libs/db/db-1.85-r1.ebuild
index 3737accf0419..2d677d512f8c 100644
--- a/sys-libs/db/db-1.85-r1.ebuild
+++ b/sys-libs/db/db-1.85-r1.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-1.85-r1.ebuild,v 1.28 2004/11/12 14:53:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r1.ebuild,v 1.29 2004/12/16 10:29:20 eradicator Exp $
inherit eutils
@@ -33,10 +33,10 @@ src_install () {
newlib.a libdb.a libdb1.a || die "newlib.a failed"
newlib.so libdb.so.2 libdb1.so.2 || die "newlib.so failed"
- dosym libdb1.so.2 /usr/lib/libdb1.so
- dosym libdb1.so.2 /usr/lib/libdb.so.2
- dosym libdb1.so.2 /usr/lib/libndbm.so
- dosym libdb1.a /usr/lib/libndbm.a
+ dosym libdb1.so.2 /usr/$(get_libdir)/libdb1.so
+ dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2
+ dosym libdb1.so.2 /usr/$(get_libdir)/libndbm.so
+ dosym libdb1.a /usr/$(get_libdir)/libndbm.a
dodir /usr/include/db1
insinto /usr/include/db1
diff --git a/sys-libs/db/db-1.85-r2.ebuild b/sys-libs/db/db-1.85-r2.ebuild
index 130d8a7901cc..6be62059f26f 100644
--- a/sys-libs/db/db-1.85-r2.ebuild
+++ b/sys-libs/db/db-1.85-r2.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-1.85-r2.ebuild,v 1.5 2004/12/14 02:33:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r2.ebuild,v 1.6 2004/12/16 10:29:20 eradicator Exp $
inherit eutils toolchain-funcs
@@ -35,10 +35,10 @@ src_install() {
newlib.a libdb.a libdb1.a || die "newlib.a failed"
newlib.so libdb.so.2 libdb1.so.2 || die "newlib.so failed"
- dosym libdb1.so.2 /usr/lib/libdb1.so
- dosym libdb1.so.2 /usr/lib/libdb.so.2
- dosym libdb1.so.2 /usr/lib/libndbm.so
- dosym libdb1.a /usr/lib/libndbm.a
+ dosym libdb1.so.2 /usr/$(get_libdir)/libdb1.so
+ dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2
+ dosym libdb1.so.2 /usr/$(get_libdir)/libndbm.so
+ dosym libdb1.a /usr/$(get_libdir)/libndbm.a
dodir /usr/include/db1
insinto /usr/include/db1
diff --git a/sys-libs/db/db-3.2.9-r10.ebuild b/sys-libs/db/db-3.2.9-r10.ebuild
index 9cfae39a7b4c..04cf814d11a4 100644
--- a/sys-libs/db/db-3.2.9-r10.ebuild
+++ b/sys-libs/db/db-3.2.9-r10.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-3.2.9-r10.ebuild,v 1.14 2004/09/27 08:05:46 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.15 2004/12/16 10:29:20 eradicator Exp $
inherit gnuconfig libtool eutils db
@@ -93,12 +93,14 @@ src_compile() {
mkdir -p ${S}/build-static
cd ${S}/build-static
../dist/configure ${conf} ${conf_static} \
+ --libdir=/usr/$(get_libdir) \
--enable-static || die
einfo "Configuring ${P} (shared)..."
mkdir -p ${S}/build-shared
cd ${S}/build-shared
../dist/configure ${conf} ${conf_shared} \
+ --libdir=/usr/$(get_libdir) \
--enable-shared || die
# Parallel make does not work
@@ -116,6 +118,7 @@ src_install () {
make libdb=libdb-3.2.a \
libcxx=libcxx_3.2.a \
prefix=${D}/usr \
+ libdir=${D}/usr/$(get_libdir) \
install || die
cd ${S}/build-static
@@ -131,7 +134,7 @@ src_install () {
# For some reason, db.so's are *not* readable by group or others,
# resulting in no one but root being able to use them!!!
# This fixes it -- DR 15 Jun 2001
- cd ${D}/usr/lib
+ cd ${D}/usr/$(get_libdir)
chmod go+rx *.so
# The .la's aren't readable either
chmod go+r *.la
diff --git a/sys-libs/db/db-3.2.9-r7.ebuild b/sys-libs/db/db-3.2.9-r7.ebuild
index 39baa69f7ee2..32ccff5afcd9 100644
--- a/sys-libs/db/db-3.2.9-r7.ebuild
+++ b/sys-libs/db/db-3.2.9-r7.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-3.2.9-r7.ebuild,v 1.15 2004/09/27 08:05:46 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r7.ebuild,v 1.16 2004/12/16 10:29:20 eradicator Exp $
IUSE=""
@@ -66,6 +66,7 @@ src_compile() {
--enable-cxx \
--enable-compat185 \
--enable-dump185 \
+ --libdir=/usr/$(get_libdir) \
--prefix=/usr"
# --enable-rpc aparently does not work .. should verify this
# at some stage ...
@@ -100,6 +101,7 @@ src_install () {
make libdb=libdb-3.2.a \
libcxx=libcxx_3.2.a \
prefix=${D}/usr \
+ libdir=${D}/usr/$(get_libdir) \
install || die
cd ${S}/build-static
@@ -112,13 +114,13 @@ src_install () {
mv *.h db3
ln db3/db.h db.h
- cd ${D}/usr/lib
+ cd ${D}/usr/$(get_libdir)
ln -s libdb-3.2.so libdb.so.3
# For some reason, db.so's are *not* readable by group or others,
# resulting in no one but root being able to use them!!!
# This fixes it -- DR 15 Jun 2001
- cd ${D}/usr/lib
+ cd ${D}/usr/$(get_libdir)
chmod go+rx *.so
# The .la's aren't readable either
chmod go+r *.la
@@ -139,7 +141,7 @@ src_install () {
}
fix_so () {
- cd ${ROOT}/usr/lib
+ cd ${ROOT}/usr/$(get_libdir)
target=`find -type f -maxdepth 1 -name "libdb-*.so" |sort |tail -n 1`
[ -n "${target}" ] && ln -sf ${target//.\//} libdb.so
target=`find -type f -maxdepth 1 -name "libdb_cxx*.so" |sort |tail -n 1`
diff --git a/sys-libs/db/db-4.0.14-r2.ebuild b/sys-libs/db/db-4.0.14-r2.ebuild
index 4a9c32c55961..c0ac23b5e61d 100644
--- a/sys-libs/db/db-4.0.14-r2.ebuild
+++ b/sys-libs/db/db-4.0.14-r2.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.0.14-r2.ebuild,v 1.24 2004/11/30 19:37:20 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r2.ebuild,v 1.25 2004/12/16 10:29:20 eradicator Exp $
IUSE="tcltk java doc"
@@ -47,7 +47,7 @@ src_compile() {
|| myconf="${myconf} --disable-java"
use tcltk \
- && myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+ && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
if use java && [ -n "${JAVAC}" ]; then
@@ -62,6 +62,7 @@ src_compile() {
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
+ --libdir=/usr/$(get_libdir) \
--enable-compat185 \
--enable-cxx \
--with-uniquename \
@@ -77,7 +78,7 @@ src_compile() {
src_install () {
- einstall || die
+ einstall libdir="${D}/usr/$(get_libdir)" || die
db_src_install_usrbinslot
diff --git a/sys-libs/db/db-4.0.14-r3.ebuild b/sys-libs/db/db-4.0.14-r3.ebuild
index a0dad6be0e27..2ff5c0aff59a 100644
--- a/sys-libs/db/db-4.0.14-r3.ebuild
+++ b/sys-libs/db/db-4.0.14-r3.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.0.14-r3.ebuild,v 1.9 2004/11/30 19:37:20 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r3.ebuild,v 1.10 2004/12/16 10:29:20 eradicator Exp $
IUSE="tcltk java doc"
@@ -52,7 +52,7 @@ src_compile() {
|| myconf="${myconf} --disable-java"
use tcltk \
- && myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+ && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
if use java && [ -n "${JAVAC}" ]; then
@@ -67,6 +67,7 @@ src_compile() {
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
+ --libdir=/usr/$(get_libdir) \
--enable-compat185 \
--enable-cxx \
--with-uniquename \
@@ -82,7 +83,7 @@ src_compile() {
src_install () {
- einstall || die
+ einstall libdir="${D}/usr/$(get_libdir)" || die
db_src_install_usrbinslot
diff --git a/sys-libs/db/db-4.1.25_p1-r3.ebuild b/sys-libs/db/db-4.1.25_p1-r3.ebuild
index 1b3e3da1e1e7..af98c10e7b7d 100644
--- a/sys-libs/db/db-4.1.25_p1-r3.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r3.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-r3.ebuild,v 1.28 2004/11/30 19:37:20 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.29 2004/12/16 10:29:20 eradicator Exp $
inherit eutils gnuconfig db
@@ -80,6 +80,7 @@ src_compile() {
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
+ --libdir=/usr/$(get_libdir) \
--enable-compat185 \
--enable-cxx \
--with-uniquename \
@@ -91,7 +92,7 @@ src_compile() {
src_install () {
- einstall || die
+ einstall libdir="${D}/usr/$(get_libdir)" || die
db_src_install_usrbinslot
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 09f71185e315..7673a1a83136 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.12 2004/12/14 16:21:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.13 2004/12/16 10:29:20 eradicator Exp $
inherit eutils gnuconfig db
@@ -88,6 +88,7 @@ src_compile() {
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
+ --libdir=/usr/$(get_libdir) \
--enable-compat185 \
--with-uniquename \
--host=${CHOST} \
@@ -98,7 +99,7 @@ src_compile() {
src_install () {
- einstall || die
+ einstall libdir="${D}/usr/$(get_libdir)" || die
db_src_install_usrbinslot
diff --git a/sys-libs/db/db-4.2.52_p1.ebuild b/sys-libs/db/db-4.2.52_p1.ebuild
index 9c84e4dac349..04f299e4e7c6 100644
--- a/sys-libs/db/db-4.2.52_p1.ebuild
+++ b/sys-libs/db/db-4.2.52_p1.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.2.52_p1.ebuild,v 1.7 2004/09/01 18:24:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p1.ebuild,v 1.8 2004/12/16 10:29:20 eradicator Exp $
IUSE="tcltk java doc"
@@ -72,7 +72,7 @@ src_compile() {
|| myconf="${myconf} --disable-java"
use tcltk \
- && myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+ && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
if use java && [ -n "${JAVAC}" ]; then
@@ -91,6 +91,7 @@ src_compile() {
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
+ --libdir=/usr/$(get_libdir) \
--enable-compat185 \
--enable-cxx \
--with-uniquename \
@@ -101,7 +102,7 @@ src_compile() {
src_install () {
- einstall || die
+ einstall libdir="${D}/usr/$(get_libdir)" || die
db_src_install_usrbinslot
diff --git a/sys-libs/db/db-4.2.52_p2.ebuild b/sys-libs/db/db-4.2.52_p2.ebuild
index d2739277dbc4..054091bf396e 100644
--- a/sys-libs/db/db-4.2.52_p2.ebuild
+++ b/sys-libs/db/db-4.2.52_p2.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.2.52_p2.ebuild,v 1.11 2004/12/08 15:51:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.12 2004/12/16 10:29:20 eradicator Exp $
IUSE="tcltk java doc"
@@ -92,6 +92,7 @@ src_compile() {
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
+ --libdir=/usr/$(get_libdir) \
--enable-compat185 \
--enable-cxx \
--with-uniquename \
@@ -102,7 +103,7 @@ src_compile() {
src_install () {
- einstall || die
+ einstall libdir="${D}/usr/$(get_libdir)" || die
db_src_install_usrbinslot