summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-23 00:36:23 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-23 00:36:23 +0000
commit65ca936a3c00c42a1042fece0b2c5aedfa42b37c (patch)
tree6901f49de864cd026c2f30c58e47ad266f74b0e5 /sys-devel
parentnew version (diff)
downloadgentoo-2-65ca936a3c00c42a1042fece0b2c5aedfa42b37c.tar.gz
gentoo-2-65ca936a3c00c42a1042fece0b2c5aedfa42b37c.tar.bz2
gentoo-2-65ca936a3c00c42a1042fece0b2c5aedfa42b37c.zip
Multilib fixes.
(Portage version: 2.0.51-r14)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/libtool/ChangeLog6
-rw-r--r--sys-devel/libtool/libtool-1.5.2-r7.ebuild11
2 files changed, 12 insertions, 5 deletions
diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 393d59e7af8a..99fb3c4dc8b2 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/libtool
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.67 2005/01/20 05:39:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.68 2005/01/23 00:36:23 eradicator Exp $
+
+ 22 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ libtool-1.5.2-r7.ebuild:
+ Multilib fixes.
20 Jan 2005; Mike Frysinger <vapier@gentoo.org> -libtool-1.5.10-r2.ebuild:
Push out updated patches.
diff --git a/sys-devel/libtool/libtool-1.5.2-r7.ebuild b/sys-devel/libtool/libtool-1.5.2-r7.ebuild
index 86b03887faa1..2a0a8ec81041 100644
--- a/sys-devel/libtool/libtool-1.5.2-r7.ebuild
+++ b/sys-devel/libtool/libtool-1.5.2-r7.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/sys-devel/libtool/libtool-1.5.2-r7.ebuild,v 1.6 2005/01/03 00:08:00 ciaranm Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r7.ebuild,v 1.7 2005/01/23 00:36:23 eradicator Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
-inherit eutils gnuconfig
+inherit eutils gnuconfig multilib
# NOTE: We install libltdl of libtool-1.3x for compat reasons ...
@@ -143,6 +143,9 @@ src_unpack() {
src_compile() {
lt_setup
+ local myconf=
+ has_multilib_profile && myconf="--libdir=/usr/$(get_libdir)"
+
#
# ************ libtool-1.3x ************
#
@@ -150,7 +153,7 @@ src_compile() {
cd ${OLD_S}
einfo "Configuring ${OLD_S##*/} ..."
- ./configure --host=${CHOST} \
+ ./configure ${myconf} --host=${CHOST} \
--prefix=/usr \
--infodir=/usr/share/info || die
@@ -164,7 +167,7 @@ src_compile() {
cd ${S}
einfo "Configuring ${S##*/} ..."
- ./configure --host=${CHOST} \
+ ./configure ${myconf} --host=${CHOST} \
--prefix=/usr \
--infodir=/usr/share/info || die