| 1 |
bicatali 08/04/01 22:10:26 |
| 2 |
|
| 3 |
Modified: fftw-2.1.5-as-needed.patch |
| 4 |
Added: fftw-3.1.2-configure.ac.patch |
| 5 |
fftw-2.1.5-configure.in.patch |
| 6 |
Removed: fftw-3.0.1-altivec.patch fftw-3.0.1-amd64.patch |
| 7 |
fftw-altivec-headers.patch 3-tmpfile.patch |
| 8 |
Log: |
| 9 |
fftw-2.1.5-r3: Fix more as-needed stuff for mpi, added fortran use flag, link more libs and headers, changed float use flag to single. fftw-3.1.2: Added a configure.ac patch in hope of fixing bug #215269, added a fortran use flag. Cleaning ebuilds and removed 3.0 version. |
| 10 |
(Portage version: 2.1.4.4) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.3 sci-libs/fftw/files/fftw-2.1.5-as-needed.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch?rev=1.3&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch?rev=1.3&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch?r1=1.2&r2=1.3 |
| 18 |
|
| 19 |
Index: fftw-2.1.5-as-needed.patch |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch,v |
| 22 |
retrieving revision 1.2 |
| 23 |
retrieving revision 1.3 |
| 24 |
diff -u -r1.2 -r1.3 |
| 25 |
--- fftw-2.1.5-as-needed.patch 30 Apr 2007 16:44:54 -0000 1.2 |
| 26 |
+++ fftw-2.1.5-as-needed.patch 1 Apr 2008 22:10:26 -0000 1.3 |
| 27 |
@@ -1,8 +1,6 @@ |
| 28 |
-Index: fftw-2.1.5/rfftw/Makefile.am |
| 29 |
-=================================================================== |
| 30 |
---- fftw-2.1.5.orig/rfftw/Makefile.am |
| 31 |
-+++ fftw-2.1.5/rfftw/Makefile.am |
| 32 |
-@@ -18,6 +18,7 @@ lib@FFTW_PREFIX@rfftw_la_SOURCES = $(COD |
| 33 |
+--- ./rfftw/Makefile.am.orig 2008-03-31 19:42:10.819805758 +0100 |
| 34 |
++++ ./rfftw/Makefile.am 2008-03-31 19:43:47.624901125 +0100 |
| 35 |
+@@ -18,6 +18,7 @@ |
| 36 |
rfftw.h |
| 37 |
|
| 38 |
lib@FFTW_PREFIX@rfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ |
| 39 |
@@ -10,3 +8,67 @@ |
| 40 |
MAINTAINERCLEANFILES = $(CODELETS) rconfig.c |
| 41 |
DISTCLEANFILES = srfftw.h drfftw.h |
| 42 |
|
| 43 |
+--- ./threads/Makefile.am.orig 2008-03-31 19:42:30.555058968 +0100 |
| 44 |
++++ ./threads/Makefile.am 2008-03-31 21:59:25.500856903 +0100 |
| 45 |
+@@ -28,6 +28,10 @@ |
| 46 |
+ -version-info @SHARED_VERSION_INFO@ \ |
| 47 |
+ -rpath $(libdir) |
| 48 |
+ |
| 49 |
++lib@FFTW_PREFIX@fftw_threads_la_LIBADD = \ |
| 50 |
++ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la \ |
| 51 |
++ @THREADLIBS@ |
| 52 |
++ |
| 53 |
+ @FFTW_PREFIX1@fftw_threads.h: fftw_threads.h |
| 54 |
+ rm -f $@ |
| 55 |
+ sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_threads.h > $@ |
| 56 |
+@@ -49,6 +53,11 @@ |
| 57 |
+ -version-info @SHARED_VERSION_INFO@ \ |
| 58 |
+ -rpath $(libdir) |
| 59 |
+ |
| 60 |
++lib@FFTW_PREFIX@rfftw_threads_la_LIBADD = \ |
| 61 |
++ $(RFFTWDIR)/lib@FFTW_PREFIX@×××××.la \ |
| 62 |
++ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la \ |
| 63 |
++ @THREADLIBS@ |
| 64 |
++ |
| 65 |
+ @FFTW_PREFIX1@rfftw_threads.h: rfftw_threads.h |
| 66 |
+ rm -f $@ |
| 67 |
+ sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_threads.h > $@ |
| 68 |
+--- ./mpi/Makefile.am.orig 2008-03-31 19:42:18.984187252 +0100 |
| 69 |
++++ ./mpi/Makefile.am 2008-03-31 22:19:12.879672814 +0100 |
| 70 |
+@@ -28,6 +28,9 @@ |
| 71 |
+ -version-info @SHARED_VERSION_INFO@ \ |
| 72 |
+ -rpath $(libdir) |
| 73 |
+ |
| 74 |
++lib@FFTW_PREFIX@fftw_mpi_la_LIBADD = \ |
| 75 |
++ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la @MPILIBS@ |
| 76 |
++ |
| 77 |
+ @FFTW_PREFIX1@fftw_mpi.h: fftw_mpi.h |
| 78 |
+ rm -f $@ |
| 79 |
+ sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_mpi.h > $@ |
| 80 |
+@@ -39,7 +42,12 @@ |
| 81 |
+ -version-info @SHARED_VERSION_INFO@ \ |
| 82 |
+ -rpath $(libdir) |
| 83 |
+ |
| 84 |
+-@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h |
| 85 |
++lib@FFTW_PREFIX@rfftw_mpi_la_LIBADD = \ |
| 86 |
++ $(RFFTWDIR)/lib@FFTW_PREFIX@×××××.la \ |
| 87 |
++ $(FFTWDIR)/lib@FFTW_PREFIX@××××.la \ |
| 88 |
++ @MPILIBS@ |
| 89 |
++ |
| 90 |
++@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h |
| 91 |
+ rm -f $@ |
| 92 |
+ sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_mpi.h > $@ |
| 93 |
+ |
| 94 |
+--- ./acx_mpi.m4.orig 2008-03-31 22:19:34.864925682 +0100 |
| 95 |
++++ ./acx_mpi.m4 2008-03-31 22:22:44.923756518 +0100 |
| 96 |
+@@ -53,8 +53,8 @@ |
| 97 |
+ ]) |
| 98 |
+ |
| 99 |
+ if test x = x"$MPILIBS"; then |
| 100 |
+- AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], |
| 101 |
+- [C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], |
| 102 |
++ AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS="-lmpi"])], |
| 103 |
++ [C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS="-lmpi"])], |
| 104 |
+ [Fortran 77], [AC_MSG_CHECKING([for MPI_Init]) |
| 105 |
+ AC_TRY_LINK([],[ call MPI_Init], [MPILIBS=" " |
| 106 |
+ AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])]) |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
1.1 sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch |
| 111 |
|
| 112 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch?rev=1.1&view=markup |
| 113 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch?rev=1.1&content-type=text/plain |
| 114 |
|
| 115 |
Index: fftw-3.1.2-configure.ac.patch |
| 116 |
=================================================================== |
| 117 |
--- configure.ac.orig 2008-03-31 23:03:45.200210228 +0100 |
| 118 |
+++ configure.ac 2008-03-31 23:06:57.111081976 +0100 |
| 119 |
@@ -135,7 +135,7 @@ |
| 120 |
AC_PROG_CC |
| 121 |
AX_COMPILER_VENDOR |
| 122 |
AC_PROG_CC_STDC |
| 123 |
-AMX_PROG_AS dnl AM_PROG_AS breaks at least one version of libtool |
| 124 |
+AM_PROG_AS |
| 125 |
AC_PROG_INSTALL |
| 126 |
AC_PROG_LN_S |
| 127 |
AC_PROG_MAKE_SET |
| 128 |
@@ -229,6 +229,8 @@ |
| 129 |
fi |
| 130 |
fi |
| 131 |
AC_SUBST(SIMD_CFLAGS) |
| 132 |
+# pass simd flags to preprocessor/compiler for proper intrinsics detection. |
| 133 |
+CPPFLAGS="$CPPFLAGS $SIMD_CFLAGS" |
| 134 |
|
| 135 |
dnl Checks for header files. |
| 136 |
AC_HEADER_STDC |
| 137 |
|
| 138 |
|
| 139 |
|
| 140 |
1.1 sci-libs/fftw/files/fftw-2.1.5-configure.in.patch |
| 141 |
|
| 142 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch?rev=1.1&view=markup |
| 143 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch?rev=1.1&content-type=text/plain |
| 144 |
|
| 145 |
Index: fftw-2.1.5-configure.in.patch |
| 146 |
=================================================================== |
| 147 |
--- configure.in.orig 2008-04-01 22:46:45.943787297 +0100 |
| 148 |
+++ configure.in 2008-04-01 22:58:13.510969518 +0100 |
| 149 |
@@ -1,6 +1,7 @@ |
| 150 |
dnl Process this file with autoconf to produce a configure script. |
| 151 |
AC_INIT(fftw/planner.c) |
| 152 |
AM_INIT_AUTOMAKE(fftw, 2.1.5) |
| 153 |
+AM_MAINTAINER_MODE |
| 154 |
|
| 155 |
dnl This is the version info according to the libtool versioning system. |
| 156 |
dnl It does *not* correspond to the release number. |
| 157 |
@@ -27,7 +28,7 @@ |
| 158 |
|
| 159 |
AC_ARG_ENABLE(float, [ --enable-float compile fftw for single precision], enable_float=$enableval, enable_float=no) |
| 160 |
if test "$enable_float" = "yes"; then |
| 161 |
- AC_DEFINE(FFTW_ENABLE_FLOAT) |
| 162 |
+ AC_DEFINE(FFTW_ENABLE_FLOAT,1,[Compile fftw for single precision]) |
| 163 |
fi |
| 164 |
|
| 165 |
FFTW_PREFIX="" |
| 166 |
@@ -56,27 +57,27 @@ |
| 167 |
|
| 168 |
AC_ARG_ENABLE(i386-hacks, [ --enable-i386-hacks enable gcc/x86 specific performance hacks], ok=$enableval, ok=no) |
| 169 |
if test "$ok" = "yes"; then |
| 170 |
- AC_DEFINE(FFTW_ENABLE_I386_HACKS) |
| 171 |
+ AC_DEFINE(FFTW_ENABLE_I386_HACKS,1,[Enable x86 specific performance hacks]) |
| 172 |
fi |
| 173 |
|
| 174 |
AC_ARG_ENABLE(pentium-timer, [ --enable-pentium-timer enable high resolution Pentium timer], ok=$enableval, ok=no) |
| 175 |
if test "$ok" = "yes"; then |
| 176 |
- AC_DEFINE(FFTW_ENABLE_PENTIUM_TIMER) |
| 177 |
+ AC_DEFINE(FFTW_ENABLE_PENTIUM_TIMER,1,[Enable high resolution Pentium timer]) |
| 178 |
fi |
| 179 |
|
| 180 |
AC_ARG_ENABLE(debug, [ --enable-debug compile fftw with extra runtime checks for debugging], ok=$enableval, ok=no) |
| 181 |
if test "$ok" = "yes"; then |
| 182 |
- AC_DEFINE(FFTW_DEBUG) |
| 183 |
+ AC_DEFINE(FFTW_DEBUG,1,[Compile with extra rutime checks for debugging]) |
| 184 |
fi |
| 185 |
|
| 186 |
AC_ARG_ENABLE(debug-alignment, [ --enable-debug-alignment enable runtime checks for alignment on x86], ok=$enableval, ok=no) |
| 187 |
if test "$ok" = "yes"; then |
| 188 |
- AC_DEFINE(FFTW_DEBUG_ALIGNMENT) |
| 189 |
+ AC_DEFINE(FFTW_DEBUG_ALIGNMENT,1,[Enable rutime checks for alignment on x86]) |
| 190 |
fi |
| 191 |
|
| 192 |
AC_ARG_ENABLE(vec-recurse, [ --enable-vec-recurse enable experimental performance hack], ok=$enableval, ok=no) |
| 193 |
if test "$ok" = "yes"; then |
| 194 |
- AC_DEFINE(FFTW_ENABLE_VECTOR_RECURSE) |
| 195 |
+ AC_DEFINE(FFTW_ENABLE_VECTOR_RECURSE,1,[Enable experimental performance hack]) |
| 196 |
fi |
| 197 |
|
| 198 |
dnl ----------------------------------------------------------------------- |
| 199 |
@@ -115,7 +116,7 @@ |
| 200 |
dnl ----------------------------------------------------------------------- |
| 201 |
|
| 202 |
AC_SUBST(SHARED_VERSION_INFO) |
| 203 |
-AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION") |
| 204 |
+AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION",[Fftw Version]) |
| 205 |
|
| 206 |
# Get the version number that will be appended to shared libraries: |
| 207 |
SHARED_VERSION=`echo $SHARED_VERSION_INFO | awk -F':' '{ print $1 "." $3 "." $2 }'` |
| 208 |
@@ -123,7 +124,7 @@ |
| 209 |
|
| 210 |
ACX_PROG_CC_MAXOPT |
| 211 |
|
| 212 |
-ACX_GCC_ALIGNS_STACK(AC_DEFINE(FFTW_GCC_ALIGNS_STACK), [ |
| 213 |
+ACX_GCC_ALIGNS_STACK(AC_DEFINE(FFTW_GCC_ALIGNS_STACK,1,[Gcc align stack]), [ |
| 214 |
if test "$enable_i386_hacks" = yes; then |
| 215 |
if test "${acx_gcc_stack_align_bug-no}" = yes; then |
| 216 |
# we are using a gcc with a stack alignment bug, and we should |
| 217 |
@@ -183,7 +184,7 @@ |
| 218 |
AC_TRY_LINK([#include <math.h> |
| 219 |
], if (!isnan(3.14159)) isnan(2.7183);, ok=yes, ok=no) |
| 220 |
if test "$ok" = "yes"; then |
| 221 |
- AC_DEFINE(HAVE_ISNAN) |
| 222 |
+ AC_DEFINE(HAVE_ISNAN,1,[Have isnan]) |
| 223 |
fi |
| 224 |
AC_MSG_RESULT(${ok}) |
| 225 |
|
| 226 |
@@ -196,7 +197,7 @@ |
| 227 |
#endif |
| 228 |
], [hrtime_t foobar;], ok=yes, ok=no) |
| 229 |
if test "$ok" = "yes"; then |
| 230 |
- AC_DEFINE(HAVE_HRTIME_T) |
| 231 |
+ AC_DEFINE(HAVE_HRTIME_T,1,[Have hrtime_t type]) |
| 232 |
fi |
| 233 |
AC_MSG_RESULT(${ok}) |
| 234 |
|
| 235 |
@@ -205,7 +206,7 @@ |
| 236 |
|
| 237 |
AC_ARG_ENABLE(unsafe-mulmod, [ --enable-unsafe-mulmod risk overflow for large prime sizes], enable_unsafe_mulmod=$enableval, enable_unsafe_mulmod=no) |
| 238 |
if test "$enable_unsafe_mulmod" = "yes"; then |
| 239 |
- AC_DEFINE(FFTW_ENABLE_UNSAFE_MULMOD) |
| 240 |
+ AC_DEFINE(FFTW_ENABLE_UNSAFE_MULMOD,1,[Risk overflow for lar prime sizes]) |
| 241 |
fi |
| 242 |
|
| 243 |
|
| 244 |
@@ -243,7 +244,7 @@ |
| 245 |
if test -z "$THREADLIBS"; then |
| 246 |
AC_MSG_ERROR([don't know how to enable OpenMP]) |
| 247 |
fi |
| 248 |
- AC_DEFINE(FFTW_USING_OPENMP_THREADS) |
| 249 |
+ AC_DEFINE(FFTW_USING_OPENMP_THREADS,1,[Using OpenMP threads]) |
| 250 |
fi |
| 251 |
if test "$with_sgimp"x != nox; then |
| 252 |
AC_MSG_CHECKING(how to enable SGI MP) |
| 253 |
@@ -261,7 +262,7 @@ |
| 254 |
if test -z "$THREADLIBS"; then |
| 255 |
AC_MSG_ERROR([don't know how to enable SGI MP]) |
| 256 |
fi |
| 257 |
- AC_DEFINE(FFTW_USING_SGIMP_THREADS) |
| 258 |
+ AC_DEFINE(FFTW_USING_SGIMP_THREADS,1,[Using SGIMP Threads]) |
| 259 |
fi |
| 260 |
|
| 261 |
# POSIX threads, the default choice: |
| 262 |
@@ -270,38 +271,38 @@ |
| 263 |
ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS " |
| 264 |
CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
| 265 |
CC="$PTHREAD_CC" |
| 266 |
- AC_DEFINE(FFTW_USING_POSIX_THREADS)]) |
| 267 |
+ AC_DEFINE(FFTW_USING_POSIX_THREADS,1,[Using POSIX Threads])]) |
| 268 |
fi |
| 269 |
# Solaris threads: |
| 270 |
if test -z "$THREADLIBS"; then |
| 271 |
AC_CHECK_LIB(thread, thr_create, |
| 272 |
[THREADLIBS="-lthread" |
| 273 |
- AC_DEFINE(FFTW_USING_SOLARIS_THREADS)]) |
| 274 |
+ AC_DEFINE(FFTW_USING_SOLARIS_THREADS,1,[Using SOLARIS Threads])]) |
| 275 |
fi |
| 276 |
# Mach C threads: |
| 277 |
if test -z "$THREADLIBS"; then |
| 278 |
AC_CHECK_FUNC(cthread_fork, |
| 279 |
[THREADLIBS=" " |
| 280 |
- AC_DEFINE(FFTW_USING_MACH_THREADS)]) |
| 281 |
+ AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach Threads])]) |
| 282 |
AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) |
| 283 |
fi |
| 284 |
if test -z "$THREADLIBS"; then |
| 285 |
AC_CHECK_LIB(cthread, cthread_fork, |
| 286 |
[THREADLIBS="-lcthread" |
| 287 |
- AC_DEFINE(FFTW_USING_MACH_THREADS)]) |
| 288 |
+ AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach Threads])]) |
| 289 |
AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) |
| 290 |
fi |
| 291 |
if test -z "$THREADLIBS"; then |
| 292 |
AC_CHECK_LIB(cthreads, cthread_fork, |
| 293 |
[THREADLIBS="-lcthreads" |
| 294 |
- AC_DEFINE(FFTW_USING_MACH_THREADS)]) |
| 295 |
+ AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach Threads])]) |
| 296 |
AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) |
| 297 |
fi |
| 298 |
# BeOS threads: |
| 299 |
if test -z "$THREADLIBS"; then |
| 300 |
AC_CHECK_FUNC(spawn_thread, |
| 301 |
[THREADLIBS=" " |
| 302 |
- AC_DEFINE(FFTW_USING_BEOS_THREADS)]) |
| 303 |
+ AC_DEFINE(FFTW_USING_BEOS_THREADS,1,[Using BEOS Threads])]) |
| 304 |
fi |
| 305 |
if test -z "$THREADLIBS"; then |
| 306 |
AC_MSG_ERROR(couldn't find threads library for --enable-threads) |
| 307 |
@@ -334,7 +335,7 @@ |
| 308 |
CC="$MPICC" |
| 309 |
ok=yes |
| 310 |
AC_TRY_LINK([#include <mpi.h> |
| 311 |
- ], [MPI_Comm_f2c(0);], [AC_DEFINE(HAVE_MPI_COMM_F2C)], [ok=no]) |
| 312 |
+ ], [MPI_Comm_f2c(0);], [AC_DEFINE(HAVE_MPI_COMM_F2C,1,[Has MPI COMM F2C])], [ok=no]) |
| 313 |
AC_MSG_RESULT($ok) |
| 314 |
CC="$save_CC" |
| 315 |
else |
| 316 |
|
| 317 |
|
| 318 |
|
| 319 |
-- |
| 320 |
gentoo-commits@l.g.o mailing list |
Archives