summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2007-05-05 18:05:22 +0200
committerEric Sandall2007-05-07 17:16:00 -0700
commit113fc2a6f95aa84e7569951f5cc79a4d62a1ff1d (patch)
treed7d5aa3f3de5ed5f4939e57bcddd1bca3f1f6848
parent344fb42f5b2ffcf27b6d2aaa4a572dc15a7dd4b7 (diff)
fftw: fix #13572
(cherry picked from commit b16d5f3bb2fe1479b3ddd726904b214bc481c031) Conflicts: libs/fftw/HISTORY
-rwxr-xr-xlibs/fftw/CONFIGURE3
-rw-r--r--libs/fftw/HISTORY3
2 files changed, 4 insertions, 2 deletions
diff --git a/libs/fftw/CONFIGURE b/libs/fftw/CONFIGURE
index 3fb99fc35c..da719c375a 100755
--- a/libs/fftw/CONFIGURE
+++ b/libs/fftw/CONFIGURE
@@ -5,8 +5,7 @@ config_query_option FFTW_THREADS "Compile FFTW SMP threads library?" n \
config_query FORTRAN "Compile in fortran bindings?" n &&
if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
config_query_option FFTW_DOUBLEOPTS "x86: enable SSE2 for doubles?" n --enable-sse2 --enable-sse2 &&
- config_query_option FFTW_FLOATOPTS "x86: enable SSE for floats?" n --enable-sse --disable-sse &&
- config_query_option FFTW_FLOATOPTS "x86: enable K7 opts (incl. 3DNow) for floats?" n --enable-k7 --disable-k7
+ config_query_option FFTW_FLOATOPTS "x86: enable SSE for floats?" n --enable-sse --disable-sse
fi &&
if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ppc" ]]; then
config_query_option FFTW_FLOATOPTS "ppc: enable AltiVec for floats?" n --enable-altivec --disable-altivec
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index f0b4941888..acb4770aae 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,6 @@
+2007-05-05 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * CONFIGURE: remove the bad k7 option #13572
+
2007-02-16 Thomas Orgis <sobukus@sourcemage.org>
* CONFIGURE,BUILD: turn grepping of CFLAGS into queries for
special optimizations, accompanying --enable with --disable