summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny van Dyk <kugelfang@gentoo.org>2005-05-28 22:59:27 +0000
committerDanny van Dyk <kugelfang@gentoo.org>2005-05-28 22:59:27 +0000
commit0753ecaf256377de7f44b3c2d03694bbf84bc026 (patch)
treec1f4af32c234bf751961c834bce752707a970b85 /dev-db/unixODBC
parentadded pkg_nofetch to tell users where to download the shoutcast ser (diff)
downloadgentoo-2-0753ecaf256377de7f44b3c2d03694bbf84bc026.tar.gz
gentoo-2-0753ecaf256377de7f44b3c2d03694bbf84bc026.tar.bz2
gentoo-2-0753ecaf256377de7f44b3c2d03694bbf84bc026.zip
Fixed BUG #94262 (multilib-strict)
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'dev-db/unixODBC')
-rw-r--r--dev-db/unixODBC/ChangeLog5
-rw-r--r--dev-db/unixODBC/unixODBC-2.2.8.ebuild11
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 46e6fd054e20..7c2db44ebb00 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/unixODBC
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.39 2005/05/10 15:29:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.40 2005/05/28 22:59:27 kugelfang Exp $
+
+ 29 May 2005; Danny van Dyk <kugelfang@gentoo.org> unixODBC-2.2.8.ebuild:
+ BUG #94262(multilib-strict) fixed as of unixODBC-2.2.8.
10 May 2005; Carsten Lohrke <carlo@gentoo.org> unixODBC-2.0.8.ebuild:
removed Qt 2 support
diff --git a/dev-db/unixODBC/unixODBC-2.2.8.ebuild b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
index 4ca05aa2f539..affcdd81ab5c 100644
--- a/dev-db/unixODBC/unixODBC-2.2.8.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.8.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/unixODBC/unixODBC-2.2.8.ebuild,v 1.17 2005/02/07 01:47:15 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.18 2005/05/28 22:59:27 kugelfang Exp $
-inherit eutils gnuconfig
+inherit eutils gnuconfig multilib
DESCRIPTION="ODBC Interface for Linux"
HOMEPAGE="http://www.unixodbc.org/"
@@ -38,11 +38,14 @@ src_compile() {
if use qt && ! use mips
then
- myconf="--enable-gui=yes --x-libraries=/usr/lib "
+ myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir) "
else
myconf="--enable-gui=no"
fi
+ # Fix multilib-strict BUG #94262
+ myconf="${myconf} --libdir=\${exec_prefix}/$(get_libdir)"
+
# Detect mips systems properly
gnuconfig_update
@@ -63,7 +66,7 @@ src_compile() {
./configure --host=${CHOST} \
--with-odbc=${S} \
--prefix=/usr \
- --x-libraries=/usr/lib \
+ --x-libraries=/usr/$(get_libdir) \
--sysconfdir=/etc/unixODBC \
${myconf} || die