diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2009-08-09 04:48:34 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-08-09 04:48:34 +0000 |
commit | 2e02028f9ef15629758f891b358ad929d4387d70 (patch) | |
tree | 2d44ac5f3943d268839fb3f5d0aa7ff019ada585 /sci-libs/fftw/files | |
parent | fix bug 247210 (diff) | |
download | gentoo-2-2e02028f9ef15629758f891b358ad929d4387d70.tar.gz gentoo-2-2e02028f9ef15629758f891b358ad929d4387d70.tar.bz2 gentoo-2-2e02028f9ef15629758f891b358ad929d4387d70.zip |
Version bump
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/fftw/files')
-rw-r--r-- | sci-libs/fftw/files/fftw-3.2-as-needed.patch | 36 | ||||
-rw-r--r-- | sci-libs/fftw/files/fftw-3.2-cppflags.patch | 11 | ||||
-rw-r--r-- | sci-libs/fftw/files/fftw-3.2-openmp.patch | 28 |
3 files changed, 0 insertions, 75 deletions
diff --git a/sci-libs/fftw/files/fftw-3.2-as-needed.patch b/sci-libs/fftw/files/fftw-3.2-as-needed.patch deleted file mode 100644 index c991b20f2396..000000000000 --- a/sci-libs/fftw/files/fftw-3.2-as-needed.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- Makefile.am.orig 2008-11-19 10:05:22.000000000 +0100 -+++ Makefile.am 2008-11-19 10:06:56.000000000 +0100 -@@ -37,6 +37,13 @@ - if SMP - if COMBINED_THREADS - COMBINED_THREADLIBS=threads/libfftw3@PREC_SUFFIX@_threads.la -+else -+lib_LTLIBRARIES += libfftw3@PREC_SUFFIX@_threads.la -+libfftw3@PREC_SUFFIX@_threads_la_SOURCES = -+libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ -+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = \ -+ libfftw3@PREC_SUFFIX@.la \ -+ threads/libfftw3@PREC_SUFFIX@_threads.la - endif - endif - ---- threads/Makefile.am.orig 2008-11-19 10:03:43.000000000 +0100 -+++ threads/Makefile.am 2008-11-19 10:05:13.000000000 +0100 -@@ -2,11 +2,7 @@ - -I$(top_srcdir)/rdft -I$(top_srcdir)/api - - if SMP --if COMBINED_THREADS - noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la --else --lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la --endif - endif - - # pkgincludedir = $(includedir)/fftw3@PREC_SUFFIX@ -@@ -16,4 +12,5 @@ - openmp.c threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \ - vrank-geq1-rdft2.c f77api.c f77funcs.h - -+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(THREADLIBS) - libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ diff --git a/sci-libs/fftw/files/fftw-3.2-cppflags.patch b/sci-libs/fftw/files/fftw-3.2-cppflags.patch deleted file mode 100644 index 4d9a1b01c028..000000000000 --- a/sci-libs/fftw/files/fftw-3.2-cppflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2008-11-19 09:57:26.000000000 +0100 -+++ configure.ac 2008-11-19 09:59:08.000000000 +0100 -@@ -264,6 +264,8 @@ - fi - fi - AC_SUBST(SIMD_CFLAGS) -+# pass simd flags to preprocessor/compiler for proper intrinsics detection. -+CPPFLAGS="$CPPFLAGS $SIMD_CFLAGS" - - dnl Checks for header files. - AC_HEADER_STDC diff --git a/sci-libs/fftw/files/fftw-3.2-openmp.patch b/sci-libs/fftw/files/fftw-3.2-openmp.patch deleted file mode 100644 index 254b9a05a28b..000000000000 --- a/sci-libs/fftw/files/fftw-3.2-openmp.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.ac.orig 2008-11-19 09:57:26.000000000 +0100 -+++ configure.ac 2008-11-19 09:59:08.000000000 +0100 -@@ -435,10 +437,10 @@ - AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no) - - if test "$enable_openmp"x != nox; then -- AX_OPENMP([THREADLIBS=" " -+ AX_OPENMP([THREADLIBS="$OPENMP_LIBS" - AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives]) - CFLAGS="$CFLAGS $OPENMP_CFLAGS"], -- [AC_MSG_ERROR([don't know how to enable OpenMP])]) -+ [AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])]) - fi - - dnl Check for threads library... ---- m4/ax_openmp.m4.orig 2008-07-10 11:33:17.361562576 +0100 -+++ m4/ax_openmp.m4 2008-07-10 12:05:14.280159723 +0100 -@@ -59,6 +59,10 @@ - else - if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then - OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp -+ OPENMP_LIBS=" " -+ if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then -+ OPENMP_LIBS="-lgomp" -+ fi - fi - m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])]) - fi |