summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jackson <mjolnir@gentoo.org>2008-01-16 06:15:20 +0000
committerMartin Jackson <mjolnir@gentoo.org>2008-01-16 06:15:20 +0000
commit58199ba089af6ccfd373c3faef5c830bade58ac0 (patch)
tree0e408b1d8cf4951ce3c833b2c281b6d1e16097fb /dev-db/postgresql
parentRemoved rails-2.0 from package.mask. (diff)
downloadgentoo-2-58199ba089af6ccfd373c3faef5c830bade58ac0.tar.gz
gentoo-2-58199ba089af6ccfd373c3faef5c830bade58ac0.tar.bz2
gentoo-2-58199ba089af6ccfd373c3faef5c830bade58ac0.zip
Multilib fix for #204760
(Portage version: 2.1.4)
Diffstat (limited to 'dev-db/postgresql')
-rw-r--r--dev-db/postgresql/ChangeLog5
-rw-r--r--dev-db/postgresql/postgresql-7.3.21.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index b93762d7a6cb..dc8d2aa7690a 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/postgresql
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.369 2008/01/16 05:55:03 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.370 2008/01/16 06:15:20 mjolnir Exp $
+
+ 16 Jan 2008; Martin Jackson <mjolnir@gentoo.org> postgresql-7.3.21.ebuild:
+ Fix multi-lib issue on 7.3.21, reported in #204760
16 Jan 2008; Martin Jackson <mjolnir@gentoo.org>
-files/postgresql-8.1.9-regress_su.patch,
diff --git a/dev-db/postgresql/postgresql-7.3.21.ebuild b/dev-db/postgresql/postgresql-7.3.21.ebuild
index 5b3079fca788..b168534fbb91 100644
--- a/dev-db/postgresql/postgresql-7.3.21.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.21.ebuild,v 1.6 2008/01/15 20:58:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.21.ebuild,v 1.7 2008/01/16 06:15:20 mjolnir Exp $
inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
@@ -61,6 +61,9 @@ src_unpack() {
sed -i -e '/\W\+\$.MAKE. -C include \$/d' src/Makefile
sed -i -e '/^\W\+psql scripts pg_config pg_controldata/ s/pg_config //' src/bin/Makefile
+ # Fix multi-lib problem reported in #204760
+ sed -i -e "s/\/lib\/python/\/$(get_libdir)\/python/" configure
+
epatch "${FILESDIR}/${P}-cubeparse.patch"
# Prepare package for future tests