| 1 |
bicatali 09/02/26 17:38:05 |
| 2 |
|
| 3 |
Added: fftw-3.2.1-as-needed.patch |
| 4 |
Log: |
| 5 |
Version bump. More as-needed fixes, and general cleanup. |
| 6 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-libs/fftw/files/fftw-3.2.1-as-needed.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: fftw-3.2.1-as-needed.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nur fftw-3.2.1.orig/configure.ac fftw-3.2.1/configure.ac |
| 17 |
--- fftw-3.2.1.orig/configure.ac 2009-02-20 19:28:55.832163268 +0000 |
| 18 |
+++ fftw-3.2.1/configure.ac 2009-02-26 15:02:37.533259854 +0000 |
| 19 |
@@ -440,14 +440,15 @@ |
| 20 |
AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no) |
| 21 |
|
| 22 |
if test "$enable_openmp"x != nox; then |
| 23 |
- AX_OPENMP([THREADLIBS=" " |
| 24 |
+ AX_OPENMP([THREADLIBS="$OPENMP_LIBS" |
| 25 |
AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives]) |
| 26 |
CFLAGS="$CFLAGS $OPENMP_CFLAGS"], |
| 27 |
- [AC_MSG_ERROR([don't know how to enable OpenMP])]) |
| 28 |
+ [AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])]) |
| 29 |
+else |
| 30 |
+ THREADLIBS="" |
| 31 |
fi |
| 32 |
|
| 33 |
dnl Check for threads library... |
| 34 |
-THREADLIBS="" |
| 35 |
if test "$enable_threads" = "yes"; then |
| 36 |
# POSIX threads, the default choice: |
| 37 |
if test -z "$THREADLIBS"; then |
| 38 |
diff -Nur fftw-3.2.1.orig/m4/ax_openmp.m4 fftw-3.2.1/m4/ax_openmp.m4 |
| 39 |
--- fftw-3.2.1.orig/m4/ax_openmp.m4 2009-02-20 19:28:55.792160754 +0000 |
| 40 |
+++ fftw-3.2.1/m4/ax_openmp.m4 2009-02-26 15:02:08.887255943 +0000 |
| 41 |
@@ -54,13 +54,18 @@ |
| 42 |
done |
| 43 |
[]_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS |
| 44 |
]) |
| 45 |
+OPENMP_LIBS=" " |
| 46 |
if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then |
| 47 |
m4_default([$2],:) |
| 48 |
else |
| 49 |
if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then |
| 50 |
OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp |
| 51 |
+ if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then |
| 52 |
+ OPENMP_LIBS="-lgomp" |
| 53 |
+ fi |
| 54 |
fi |
| 55 |
m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])]) |
| 56 |
fi |
| 57 |
AC_SUBST(OPENMP_[]_AC_LANG_PREFIX[]FLAGS) |
| 58 |
+AC_SUBST(OPENMP_LIBS) |
| 59 |
])dnl AX_OPENMP |
| 60 |
diff -Nur fftw-3.2.1.orig/Makefile.am fftw-3.2.1/Makefile.am |
| 61 |
--- fftw-3.2.1.orig/Makefile.am 2009-02-20 19:28:56.040169973 +0000 |
| 62 |
+++ fftw-3.2.1/Makefile.am 2009-02-26 15:02:08.887255943 +0000 |
| 63 |
@@ -36,6 +36,13 @@ |
| 64 |
if SMP |
| 65 |
if COMBINED_THREADS |
| 66 |
COMBINED_THREADLIBS=threads/libfftw3@PREC_SUFFIX@_threads.la |
| 67 |
+else |
| 68 |
+lib_LTLIBRARIES += libfftw3@PREC_SUFFIX@_threads.la |
| 69 |
+libfftw3@PREC_SUFFIX@_threads_la_SOURCES = |
| 70 |
+libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ |
| 71 |
+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = \ |
| 72 |
+ libfftw3@PREC_SUFFIX@.la \ |
| 73 |
+ threads/libfftw3@PREC_SUFFIX@_threads.la |
| 74 |
endif |
| 75 |
endif |
| 76 |
|
| 77 |
diff -Nur fftw-3.2.1.orig/threads/Makefile.am fftw-3.2.1/threads/Makefile.am |
| 78 |
--- fftw-3.2.1.orig/threads/Makefile.am 2009-02-20 19:28:55.832163268 +0000 |
| 79 |
+++ fftw-3.2.1/threads/Makefile.am 2009-02-26 15:02:08.887255943 +0000 |
| 80 |
@@ -2,11 +2,7 @@ |
| 81 |
-I$(top_srcdir)/rdft -I$(top_srcdir)/api |
| 82 |
|
| 83 |
if SMP |
| 84 |
-if COMBINED_THREADS |
| 85 |
noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la |
| 86 |
-else |
| 87 |
-lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la |
| 88 |
-endif |
| 89 |
endif |
| 90 |
|
| 91 |
# pkgincludedir = $(includedir)/fftw3@PREC_SUFFIX@ |
| 92 |
@@ -16,4 +12,5 @@ |
| 93 |
openmp.c threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \ |
| 94 |
vrank-geq1-rdft2.c f77api.c f77funcs.h |
| 95 |
|
| 96 |
+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(THREADLIBS) |
| 97 |
libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ |
Archives