Multilib fixes for when DEFAULT_ABI is not the default of the toolchain.

Package-Manager: portage-2.0.51.19

4 files changed, 76 insertions, 62 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index e77d9420b2b5..c9c8def94e86 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.187 2005/02/24 20:59:32 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.188 2005/03/09 08:15:33 eradicator Exp $
+
+  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  postgresql-7.4.7-r1.ebuild, postgresql-8.0.1-r1.ebuild:
+  Multilib fixes for when DEFAULT_ABI is not the default of the toolchain.
 
   24 Feb 2005; petre rodan <kaiowas@gentoo.org> postgresql-7.3.6-r1.ebuild,
   postgresql-7.3.7-r2.ebuild, postgresql-7.3.8.ebuild,
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index e9907bfd30e2..2451ab0882a8 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,86 +1,96 @@
-MD5 ff737c28ef41846354f99ef118a3970f ChangeLog 34351
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e61e9335b2939411bbdd7ab45527f258 ChangeLog 34545
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 20e3e37c02b6d8ea6de9f2ac0261aeb9 postgresql-7.4.3-r1.ebuild 10108
-MD5 ff6f083a649f8f56baa98d386bf4fc67 postgresql-7.4.3.ebuild 9816
-MD5 a7ddb837a8e5f4185f80084d12cb26db postgresql-7.4.5.ebuild 10126
 MD5 d193fb4efd1f7af60c275813eb732035 postgresql-7.3.6-r1.ebuild 7558
-MD5 f50385e6369ab23d971e54556c3bd79c postgresql-7.3.9.ebuild 8029
-MD5 304fd4d70f4af99b5d71b2e2a8dd091b postgresql-7.4.7.ebuild 10571
-MD5 ce29d9a5d68214c3295637e44ee5583f postgresql-7.3.8.ebuild 8030
 MD5 62378567412e5a30aaf0587efe5c4297 postgresql-7.3.7-r2.ebuild 8004
+MD5 ce29d9a5d68214c3295637e44ee5583f postgresql-7.3.8.ebuild 8030
+MD5 20e3e37c02b6d8ea6de9f2ac0261aeb9 postgresql-7.4.3-r1.ebuild 10108
+MD5 ff6f083a649f8f56baa98d386bf4fc67 postgresql-7.4.3.ebuild 9816
 MD5 98cc1f2ce8a28b6d1d14b65a4a6ffab3 postgresql-7.4.5-r1.ebuild 10138
 MD5 a73b94b56ed3cf01372c2738d1dea021 postgresql-7.4.5-r2.ebuild 10168
+MD5 a7ddb837a8e5f4185f80084d12cb26db postgresql-7.4.5.ebuild 10126
 MD5 471cdf4debd31c9ea84e4bdc30994411 postgresql-7.4.6.ebuild 10578
-MD5 74252610db00139ea781984fb3d5f489 postgresql-8.0.1.ebuild 7367
 MD5 b7f7e9c1140834bb073859ef3d72bc1d postgresql-8.0.0.ebuild 7367
+MD5 f50385e6369ab23d971e54556c3bd79c postgresql-7.3.9.ebuild 8029
+MD5 304fd4d70f4af99b5d71b2e2a8dd091b postgresql-7.4.7.ebuild 10571
+MD5 74252610db00139ea781984fb3d5f489 postgresql-8.0.1.ebuild 7367
 MD5 e8801f803d71c5547413a8fb6874a6a7 postgresql-7.3.9-r1.ebuild 8078
-MD5 e7c1530b7ce08a872e147d60922e0cd5 postgresql-7.4.7-r1.ebuild 10626
-MD5 90513832f513d1ccd55e6f8caf3edc2c postgresql-8.0.1-r1.ebuild 7422
-MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3-r1 290
+MD5 adbd082118d1d8fe6bdf95636dd9e2e7 postgresql-7.4.7-r1.ebuild 10754
+MD5 c503d14ceb1ade17a1a3678c3043b9a9 postgresql-8.0.1-r1.ebuild 7549
+MD5 eb2eba5dfa7b1f85b4323b219368044b files/postgresql.init-7.4.5 1279
+MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r1 223
+MD5 b54624cb385431b9b3d4b167c2a9aca4 files/postgresql.init-7.4.3 1281
+MD5 b22b4de6c3cc06beed0ed3e1f8df257f files/digest-postgresql-7.3.7-r2 223
+MD5 db140f8202f740ac22fa8185927999e0 files/postgresql.init-7.4.6 1279
+MD5 2bf145f0cc937ec4b3146b2ac9fc255c files/digest-postgresql-7.3.8 223
 MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3 290
-MD5 fe8563fd37bfee794b28728f0842b888 files/postgresql.init-7.3.6 1281
-MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
+MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3-r1 290
 MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5 290
-MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r1 223
+MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r1 290
+MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r2 290
+MD5 0fd21b9794e41d1f8b0ac360acf743d8 files/digest-postgresql-7.4.6 290
+MD5 443d8f3814093d85bcc736cf86a2cac0 files/digest-postgresql-8.0.0 223
+MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9 223
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390
+MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.3 302
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.5 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.6 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.0 302
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7 290
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
+MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
+MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443
 MD5 683d803768f3060ffc4bd5a6f5c91918 files/pg_autovacuum.init-7.4.3 1064
+MD5 8fa377b0390f126d8ef3ee0909f7f813 files/pg_autovacuum.init-7.4.5 1414
+MD5 52434d5b7d919db061399aed45ad4c08 files/pg_autovacuum.init-7.4.6 1414
+MD5 bdd82428192638b7dd7c21ee2dd04089 files/pg_autovacuum.init-8.0.0 1414
+MD5 cdb90ea55ba57a76d898f14e63b921fa files/digest-postgresql-8.0.1 223
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
+MD5 cd9e32f5a21def1a4e2d1ac0e042aa47 files/postgresql-7.3.7-gentoo.patch 529
+MD5 a12e2f4ae7117b664e78b9966db14096 files/postgresql-7.3.7-tempfile.patch 1453
+MD5 8825eddcfe252e724f9e23dd9d8eb4fa files/postgresql-7.3.8-gentoo.patch 529
 MD5 7b8bf110e22829c7040aa1e87afa371c files/postgresql-7.4.3-gentoo.patch 631
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.3-hppa-testandset.patch 1596
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.3-vacuum-delay.patch 8918
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.3 390
-MD5 b54624cb385431b9b3d4b167c2a9aca4 files/postgresql.init-7.4.3 1281
-MD5 2bf145f0cc937ec4b3146b2ac9fc255c files/digest-postgresql-7.3.8 223
-MD5 8fa377b0390f126d8ef3ee0909f7f813 files/pg_autovacuum.init-7.4.5 1414
 MD5 b953b7e3784ac0d01467f1e740a96a8a files/postgresql-7.4.5-gentoo.patch 631
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.5-hppa-testandset.patch 1596
-MD5 0fd21b9794e41d1f8b0ac360acf743d8 files/digest-postgresql-7.4.6 290
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.5-vacuum-delay.patch 8918
-MD5 b22b4de6c3cc06beed0ed3e1f8df257f files/digest-postgresql-7.3.7-r2 223
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.5 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.0 390
-MD5 fb7c6cd99264f1a121d07cf812e9f99b files/postgresql.init-7.3.7 1279
-MD5 eb2eba5dfa7b1f85b4323b219368044b files/postgresql.init-7.4.5 1279
-MD5 2d09c23680cd7d8f706a2fe8cc41b8fa files/postgresql.init-8.0.0 1279
-MD5 cd9e32f5a21def1a4e2d1ac0e042aa47 files/postgresql-7.3.7-gentoo.patch 529
-MD5 a12e2f4ae7117b664e78b9966db14096 files/postgresql-7.3.7-tempfile.patch 1453
-MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r1 290
 MD5 18249476d920987d48972156c34bec75 files/postgresql-7.4.5-r1-gentoo.patch 1160
-MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9 223
-MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7 290
-MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r2 290
 MD5 48e0a30256ff63828820519640b44833 files/postgresql-7.4.5-tempfile.patch 1453
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.6 302
-MD5 52434d5b7d919db061399aed45ad4c08 files/pg_autovacuum.init-7.4.6 1414
-MD5 8825eddcfe252e724f9e23dd9d8eb4fa files/postgresql-7.3.8-gentoo.patch 529
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.5-vacuum-delay.patch 8918
 MD5 e9a2e5278a70bebace44f1ecf38129e6 files/postgresql-7.4.6-gentoo.patch 1160
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.6-hppa-testandset.patch 1596
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.6-vacuum-delay.patch 8918
+MD5 8c15706d957604bad595fc940f933ef3 files/postgresql-8.0.0-gentoo.patch 808
+MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390
+MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279
+MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.3 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.5 390
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.6 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.0 390
+MD5 fe8563fd37bfee794b28728f0842b888 files/postgresql.init-7.3.6 1281
+MD5 fb7c6cd99264f1a121d07cf812e9f99b files/postgresql.init-7.3.7 1279
 MD5 f2a242fa36b13934a9011de1bb1d9825 files/postgresql.init-7.3.8 1279
-MD5 db140f8202f740ac22fa8185927999e0 files/postgresql.init-7.4.6 1279
-MD5 cdb90ea55ba57a76d898f14e63b921fa files/digest-postgresql-8.0.1 223
+MD5 2d09c23680cd7d8f706a2fe8cc41b8fa files/postgresql.init-8.0.0 1279
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.7 302
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.1 302
 MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.7 1414
 MD5 62959a2ffd56e0e360b1437467c573a7 files/pg_autovacuum.init-8.0.1 1414
 MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
-MD5 443d8f3814093d85bcc736cf86a2cac0 files/digest-postgresql-8.0.0 223
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.0 302
-MD5 bdd82428192638b7dd7c21ee2dd04089 files/pg_autovacuum.init-8.0.0 1414
-MD5 8c15706d957604bad595fc940f933ef3 files/postgresql-8.0.0-gentoo.patch 808
-MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
 MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390
-MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279
 MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279
-MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
-MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223
-MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
 MD5 cdb90ea55ba57a76d898f14e63b921fa files/digest-postgresql-8.0.1-r1 223
-MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443
 MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773
 MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCLrC2ArHZZzCEUG0RAmxKAJ4tThTPaTzVd0nLCg/ydQZMzuyAaQCeJlMC
+fU4ILkkIOEvuLTO2wSjGTRk=
+=OBkH
+-----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql/postgresql-7.4.7-r1.ebuild b/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
index 1bba627e1108..4f36476cddb6 100644
--- a/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r1.ebuild,v 1.11 2005/03/09 00:51:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r1.ebuild,v 1.12 2005/03/09 08:15:33 eradicator Exp $
 
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
+inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
@@ -135,11 +135,11 @@ src_compile() {
 		--with-maxbackends=${MAX_CONNECTIONS} \
 		$myconf || die
 
-	make || die
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
-	make || die
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	if use xml2; then
-		make -C xml || die
+		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
 
diff --git a/dev-db/postgresql/postgresql-8.0.1-r1.ebuild b/dev-db/postgresql/postgresql-8.0.1-r1.ebuild
index 280ec67a306e..f7fed0462d6c 100644
--- a/dev-db/postgresql/postgresql-8.0.1-r1.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r1.ebuild,v 1.2 2005/02/24 20:59:32 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r1.ebuild,v 1.3 2005/03/09 08:15:33 eradicator Exp $
 
-inherit eutils gnuconfig flag-o-matic multilib
+inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
@@ -100,12 +100,12 @@ src_compile() {
 		--with-maxbackends=${MAX_CONNECTIONS} \
 		$myconf || die
 
-	make || die
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
-	make || die
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	if use xml2; then
 		cd xml2
-		make || die
+		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }