Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/fftw/files: fftw-3.1.2-configure.ac.patch fftw-2.1.5-configure.in.patch fftw-3.1.2-openmp.patch fftw-3.1.2-as-needed.patch
Date: Wed, 02 Jul 2008 09:20:28
Message-Id: E1KDyVj-0000qS-6Z@stork.gentoo.org
1 bicatali 08/07/02 09:20:23
2
3 Modified: fftw-3.1.2-configure.ac.patch
4 fftw-2.1.5-configure.in.patch
5 Added: fftw-3.1.2-openmp.patch fftw-3.1.2-as-needed.patch
6 Log:
7 Added openmp support for both fftw-2 and fftw-3. Added as-needed fixes for fftw-3, needed for threads support. Added a doc use flag for fftw-3.
8 (Portage version: 2.1.4.4)
9
10 Revision Changes Path
11 1.2 sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch?r1=1.1&r2=1.2
16
17 Index: fftw-3.1.2-configure.ac.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- fftw-3.1.2-configure.ac.patch 1 Apr 2008 22:10:26 -0000 1.1
24 +++ fftw-3.1.2-configure.ac.patch 2 Jul 2008 09:20:22 -0000 1.2
25 @@ -1,5 +1,5 @@
26 ---- configure.ac.orig 2008-03-31 23:03:45.200210228 +0100
27 -+++ configure.ac 2008-03-31 23:06:57.111081976 +0100
28 +--- configure.ac.orig 2008-06-30 23:10:27.431674828 +0100
29 ++++ configure.ac 2008-06-30 23:50:59.266804845 +0100
30 @@ -135,7 +135,7 @@
31 AC_PROG_CC
32 AX_COMPILER_VENDOR
33 @@ -18,3 +18,12 @@
34
35 dnl Checks for header files.
36 AC_HEADER_STDC
37 +@@ -362,7 +364,7 @@
38 + THREADLIBS=""
39 + if test "$enable_threads" = "yes"; then
40 + if test "$with_openmp"x != nox; then
41 +- AX_OPENMP([THREADLIBS=" "
42 ++ AX_OPENMP([THREADLIBS="$OPENMP_LIBS"
43 + AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives])
44 + CFLAGS="$CFLAGS $OPENMP_CFLAGS"],
45 + [AC_MSG_ERROR([don't know how to enable OpenMP])])
46
47
48
49 1.2 sci-libs/fftw/files/fftw-2.1.5-configure.in.patch
50
51 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch?rev=1.2&view=markup
52 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch?rev=1.2&content-type=text/plain
53 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch?r1=1.1&r2=1.2
54
55 Index: fftw-2.1.5-configure.in.patch
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch,v
58 retrieving revision 1.1
59 retrieving revision 1.2
60 diff -u -r1.1 -r1.2
61 --- fftw-2.1.5-configure.in.patch 1 Apr 2008 22:10:26 -0000 1.1
62 +++ fftw-2.1.5-configure.in.patch 2 Jul 2008 09:20:22 -0000 1.2
63 @@ -1,5 +1,5 @@
64 ---- configure.in.orig 2008-04-01 22:46:45.943787297 +0100
65 -+++ configure.in 2008-04-01 22:58:13.510969518 +0100
66 +--- configure.in.orig 2008-06-22 17:01:59.013047109 +0100
67 ++++ configure.in 2008-06-22 17:17:39.421924454 +0100
68 @@ -1,6 +1,7 @@
69 dnl Process this file with autoconf to produce a configure script.
70 AC_INIT(fftw/planner.c)
71 @@ -95,7 +95,24 @@
72 fi
73
74
75 -@@ -243,7 +244,7 @@
76 +@@ -230,6 +231,16 @@
77 + AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS=" "
78 + omp_enabler="$CC -omp")
79 + if test -z "$THREADLIBS"; then
80 ++ CFLAGS="$save_CFLAGS -fopenmp"
81 ++ AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS="-lgomp"
82 ++ omp_enabler="$CC -fopenmp")
83 ++ fi
84 ++ if test -z "$THREADLIBS"; then
85 ++ CFLAGS="$save_CFLAGS -fopenmp"
86 ++ AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS=""
87 ++ omp_enabler="$CC -openmp")
88 ++ fi
89 ++ if test -z "$THREADLIBS"; then
90 + CFLAGS="$save_CFLAGS -mp"
91 + AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS=" "
92 + omp_enabler="$CC -mp")
93 +@@ -243,7 +249,7 @@
94 if test -z "$THREADLIBS"; then
95 AC_MSG_ERROR([don't know how to enable OpenMP])
96 fi
97 @@ -104,7 +121,7 @@
98 fi
99 if test "$with_sgimp"x != nox; then
100 AC_MSG_CHECKING(how to enable SGI MP)
101 -@@ -261,7 +262,7 @@
102 +@@ -261,7 +267,7 @@
103 if test -z "$THREADLIBS"; then
104 AC_MSG_ERROR([don't know how to enable SGI MP])
105 fi
106 @@ -113,7 +130,7 @@
107 fi
108
109 # POSIX threads, the default choice:
110 -@@ -270,38 +271,38 @@
111 +@@ -270,38 +276,38 @@
112 ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS "
113 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
114 CC="$PTHREAD_CC"
115 @@ -158,7 +175,7 @@
116 fi
117 if test -z "$THREADLIBS"; then
118 AC_MSG_ERROR(couldn't find threads library for --enable-threads)
119 -@@ -334,7 +335,7 @@
120 +@@ -334,7 +340,7 @@
121 CC="$MPICC"
122 ok=yes
123 AC_TRY_LINK([#include <mpi.h>
124
125
126
127 1.1 sci-libs/fftw/files/fftw-3.1.2-openmp.patch
128
129 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-openmp.patch?rev=1.1&view=markup
130 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-openmp.patch?rev=1.1&content-type=text/plain
131
132 Index: fftw-3.1.2-openmp.patch
133 ===================================================================
134 --- m4/ax_openmp.m4.orig 2008-07-01 00:14:48.814076874 +0100
135 +++ m4/ax_openmp.m4 2008-06-30 23:42:30.534809664 +0100
136 @@ -59,6 +59,9 @@
137 else
138 if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
139 OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
140 + if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then
141 + OPENMP_LIBS="-lgomp"
142 + fi
143 fi
144 m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
145 fi
146
147
148
149 1.1 sci-libs/fftw/files/fftw-3.1.2-as-needed.patch
150
151 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-as-needed.patch?rev=1.1&view=markup
152 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/files/fftw-3.1.2-as-needed.patch?rev=1.1&content-type=text/plain
153
154 Index: fftw-3.1.2-as-needed.patch
155 ===================================================================
156 --- Makefile.am.orig 2008-06-22 14:49:18.725790127 +0100
157 +++ Makefile.am 2008-06-22 15:09:37.339234950 +0100
158 @@ -35,6 +35,13 @@
159 if THREADS
160 if COMBINED_THREADS
161 COMBINED_THREADLIBS=threads/libfftw3@PREC_SUFFIX@_threads.la
162 +else
163 +lib_LTLIBRARIES += libfftw3@PREC_SUFFIX@_threads.la
164 +libfftw3@PREC_SUFFIX@_threads_la_SOURCES =
165 +libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
166 +libfftw3@PREC_SUFFIX@_threads_la_LIBADD = \
167 + libfftw3@PREC_SUFFIX@.la \
168 + threads/libfftw3@PREC_SUFFIX@_threads.la
169 endif
170 endif
171
172 --- threads/Makefile.am.orig 2008-07-01 11:46:56.464637525 +0100
173 +++ threads/Makefile.am 2008-07-01 11:48:02.268387467 +0100
174 @@ -2,15 +2,12 @@
175 -I$(top_srcdir)/rdft -I$(top_srcdir)/api
176
177 if THREADS
178 -if COMBINED_THREADS
179 noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
180 -else
181 -lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
182 -endif
183 endif
184
185 libfftw3@PREC_SUFFIX@_threads_la_SOURCES = api.c conf.c threads.c \
186 threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \
187 vrank-geq1-rdft2.c f77api.c f77funcs.h
188
189 +libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(THREADLIBS)
190 libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
191
192
193
194 --
195 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups