diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2009-10-15 17:11:22 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-10-15 17:11:22 +0000 |
commit | c0aaecef0b30d86e556a4b4cf4816dd44dd6cc20 (patch) | |
tree | 5eb21e8ce86ef220c15ec60552b57e89da9109a6 /sci-libs/fftw/files | |
parent | Version bump, bug 289190. (diff) | |
download | gentoo-2-c0aaecef0b30d86e556a4b4cf4816dd44dd6cc20.tar.gz gentoo-2-c0aaecef0b30d86e556a4b4cf4816dd44dd6cc20.tar.bz2 gentoo-2-c0aaecef0b30d86e556a4b4cf4816dd44dd6cc20.zip |
Removed old and filter as-needed when building with Intel compilers
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/fftw/files')
-rw-r--r-- | sci-libs/fftw/files/fftw-3.1.2-as-needed.patch | 35 | ||||
-rw-r--r-- | sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch | 33 | ||||
-rw-r--r-- | sci-libs/fftw/files/fftw-3.1.2-openmp.patch | 13 |
3 files changed, 0 insertions, 81 deletions
diff --git a/sci-libs/fftw/files/fftw-3.1.2-as-needed.patch b/sci-libs/fftw/files/fftw-3.1.2-as-needed.patch deleted file mode 100644 index fca95715827c..000000000000 --- a/sci-libs/fftw/files/fftw-3.1.2-as-needed.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.am.orig 2008-06-22 14:49:18.725790127 +0100 -+++ Makefile.am 2008-06-22 15:09:37.339234950 +0100 -@@ -35,6 +35,13 @@ - if THREADS - 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-07-01 11:46:56.464637525 +0100 -+++ threads/Makefile.am 2008-07-01 11:48:02.268387467 +0100 -@@ -2,15 +2,12 @@ - -I$(top_srcdir)/rdft -I$(top_srcdir)/api - - if THREADS --if COMBINED_THREADS - noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la --else --lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la --endif - endif - - libfftw3@PREC_SUFFIX@_threads_la_SOURCES = api.c conf.c threads.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.1.2-configure.ac.patch b/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch deleted file mode 100644 index 713c2a7d7ed7..000000000000 --- a/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.ac.orig 2008-07-10 11:29:58.506230457 +0100 -+++ configure.ac 2008-07-10 11:49:45.171417438 +0100 -@@ -135,7 +135,7 @@ - AC_PROG_CC - AX_COMPILER_VENDOR - AC_PROG_CC_STDC --AMX_PROG_AS dnl AM_PROG_AS breaks at least one version of libtool -+AM_PROG_AS - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET -@@ -229,6 +229,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 -@@ -362,10 +364,10 @@ - THREADLIBS="" - if test "$enable_threads" = "yes"; then - if test "$with_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 - - # POSIX threads, the default choice: diff --git a/sci-libs/fftw/files/fftw-3.1.2-openmp.patch b/sci-libs/fftw/files/fftw-3.1.2-openmp.patch deleted file mode 100644 index b1948b3ca463..000000000000 --- a/sci-libs/fftw/files/fftw-3.1.2-openmp.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 |