diff options
| author |   Olivier Fisette <ribosome@gentoo.org> | 2006-10-22 18:10:34 +0000 |
|---|---|---|
| committer | Olivier Fisette <ribosome@gentoo.org> | 2006-10-22 18:10:34 +0000 |
| commit | 23d8017c2838abf72277c3176be261d559550cd2 (patch) | |
| tree | c3125d992cd11480277970a81633516f562fc592 /sci-libs/fftw | |
| parent | Version bump with minor changes. (diff) | |
| download | gentoo-2-23d8017c2838abf72277c3176be261d559550cd2.tar.gz gentoo-2-23d8017c2838abf72277c3176be261d559550cd2.tar.bz2 gentoo-2-23d8017c2838abf72277c3176be261d559550cd2.zip | |
Fix --as-needed (see bug #152393)
(Portage version: 2.1.1)
Diffstat (limited to 'sci-libs/fftw')
| -rw-r--r-- | sci-libs/fftw/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/fftw/fftw-2.1.5-r1.ebuild | 4 | ||||
| -rw-r--r-- | sci-libs/fftw/files/fftw-2.1.5-as-needed.patch | 11 |
3 files changed, 20 insertions, 2 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index f3d0a7478860..73e599a4eb89 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/fftw # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.40 2006/10/06 21:59:56 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.41 2006/10/22 18:10:34 ribosome Exp $ + + 22 Oct 2006; Olivier Fisette <ribosome@gentoo.org> + +files/fftw-2.1.5-as-needed.patch, fftw-2.1.5-r1.ebuild: + Fix --as-needed (patch by Alexis Ballier <aballier@gentoo.org>; fixes bug + #152393). 06 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; fftw-2.1.5-r1.ebuild: Revert accidental commit; not yet ready to allow virtual/mpi, amd64 doesn't diff --git a/sci-libs/fftw/fftw-2.1.5-r1.ebuild b/sci-libs/fftw/fftw-2.1.5-r1.ebuild index c59313486cc7..2f9d8d4080c6 100644 --- a/sci-libs/fftw/fftw-2.1.5-r1.ebuild +++ b/sci-libs/fftw/fftw-2.1.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.9 2006/10/06 21:59:56 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.10 2006/10/22 18:10:34 ribosome Exp $ inherit flag-o-matic multilib @@ -65,6 +65,7 @@ src_compile() { #it might be needed if it is decided that lam is an optional dependence cd "${S}-single" + epatch "${FILESDIR}/${P}-as-needed.patch" econf \ --enable-shared \ --enable-threads \ @@ -76,6 +77,7 @@ src_compile() { #the only difference here is no --enable-float cd "${S}-double" + epatch "${FILESDIR}/${P}-as-needed.patch" econf \ --enable-shared \ --enable-threads \ diff --git a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch new file mode 100644 index 000000000000..f34ee1237e8d --- /dev/null +++ b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch @@ -0,0 +1,11 @@ +--- fftw-2.1.5-single/rfftw/Makefile.in.old 2006-10-22 18:30:13.000000000 +0200 ++++ fftw-2.1.5-single/rfftw/Makefile.in 2006-10-22 18:45:49.000000000 +0200 +@@ -177,7 +177,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-lib@FFTW_PREFIX@rfftw_la_LIBADD = ++lib@FFTW_PREFIX@rfftw_la_LIBADD = ../fftw/lib@FFTW_PREFIX@fftw.la + am__objects_1 = frc_1.lo frc_2.lo frc_3.lo frc_4.lo frc_5.lo frc_6.lo \ + frc_7.lo frc_8.lo frc_9.lo frc_10.lo frc_11.lo frc_12.lo \ + frc_13.lo frc_14.lo frc_15.lo frc_16.lo frc_32.lo frc_64.lo \ |