summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-03-03 12:42:47 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-03-03 12:42:47 +0000
commit3d63c75bfbcca1f07141a263dbedb4ea72008345 (patch)
treea25b758fef5119a31e6148e8057920a147e932c6 /sci-libs/fftw
parentMarked ~amd64, keywording KDE split ebuilds, bug 80944. (diff)
downloadgentoo-2-3d63c75bfbcca1f07141a263dbedb4ea72008345.tar.gz
gentoo-2-3d63c75bfbcca1f07141a263dbedb4ea72008345.tar.bz2
gentoo-2-3d63c75bfbcca1f07141a263dbedb4ea72008345.zip
Multilib fixes.
(Portage version: 2.0.51.18)
Diffstat (limited to 'sci-libs/fftw')
-rw-r--r--sci-libs/fftw/ChangeLog6
-rw-r--r--sci-libs/fftw/fftw-2.1.5-r1.ebuild25
2 files changed, 17 insertions, 14 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index dd259d884825..db3d749ff00f 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/fftw
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.5 2005/01/13 17:23:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.6 2005/03/03 12:42:47 eradicator Exp $
+
+ 03 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ fftw-2.1.5-r1.ebuild:
+ Multilib fixes.
13 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>; fftw-2.1.5-r1.ebuild:
Change insinto "${D}usr/include" to insinto /usr/include, thanks to Seemant
diff --git a/sci-libs/fftw/fftw-2.1.5-r1.ebuild b/sci-libs/fftw/fftw-2.1.5-r1.ebuild
index 64f50c269050..66dae44e76e7 100644
--- a/sci-libs/fftw/fftw-2.1.5-r1.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-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/sci-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.3 2005/01/13 17:23:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.4 2005/03/03 12:42:47 eradicator Exp $
-inherit flag-o-matic
+inherit flag-o-matic multilib
IUSE="mpi"
@@ -14,7 +14,6 @@ DEPEND="mpi? ( >=sys-cluster/lam-mpi-6.5.6 )"
SLOT="2.1"
LICENSE="GPL-2"
-#remove ~'s on ppc and sparc when removig on x86 (as per recent discussion on -core)
KEYWORDS="x86 ppc sparc alpha amd64"
#this one is reported to cause trouble on pentium4 m series
@@ -117,22 +116,22 @@ src_install () {
dosym srfftw.h /usr/include/rfftw.h
dosym sfftw_threads.h /usr/include/fftw_threads.h
dosym srfftw_threads.h /usr/include/rfftw_threads.h
- cd ${D}usr/lib
- dosym libsfftw.so /usr/lib/libfftw.so
- dosym libsrfftw.so /usr/lib/librfftw.so
- dosym libsfftw_threads.so /usr/lib/libfftw_threads.so
- dosym libsrfftw_threads.so /usr/lib/librfftw_threads.so
+ cd ${D}usr/$(get_libdir)
+ dosym libsfftw.so /usr/$(get_libdir)/libfftw.so
+ dosym libsrfftw.so /usr/$(get_libdir)/librfftw.so
+ dosym libsfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so
+ dosym libsrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so
else
cd ${D}usr/include
dosym dfftw.h /usr/include/fftw.h
dosym drfftw.h /usr/include/rfftw.h
dosym dfftw_threads.h /usr/include/fftw_threads.h
dosym drfftw_threads.h /usr/include/rfftw_threads.h
- cd ${D}usr/lib
- dosym libdfftw.so /usr/lib/libfftw.so
- dosym libdrfftw.so /usr/lib/librfftw.so
- dosym libdfftw_threads.so /usr/lib/libfftw_threads.so
- dosym libdrfftw_threads.so /usr/lib/librfftw_threads.so
+ cd ${D}usr/$(get_libdir)
+ dosym libdfftw.so /usr/$(get_libdir)/libfftw.so
+ dosym libdrfftw.so /usr/$(get_libdir)/librfftw.so
+ dosym libdfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so
+ dosym libdrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so
fi
cd "${S}-single/fortran"