Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (65cfa07476202d1d995f1cb938f965b53eea2961)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (65cfa07476202d1d995f1cb938f965b53eea2961)
  • Date: Mon, 8 Dec 2008 07:19:36 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

libs/fftw/BUILD | 2 +-
libs/fftw/CONFIGURE | 4 ++--
libs/fftw/HISTORY | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 65cfa07476202d1d995f1cb938f965b53eea2961
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

fftw: don't ask about fma, it is breaking the build now (x86)

diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index 34b53b6..219c6b8 100755
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -2,7 +2,7 @@ if [[ $FORTRAN == "n" ]]; then
OPTS="$OPTS --disable-fortran"
fi &&
CFLAGS="${CFLAGS/-Os/}" &&
-OPTS="$OPTS $FFTW_THREADS $FFTW_OPTS" &&
+OPTS="$OPTS $FFTW_THREADS $FFTW_OPTS --disable-fma" &&
cd $SOURCE_DIRECTORY/fftw-single-$VERSION &&
./configure --prefix=${INSTALL_ROOT}/usr \
--enable-shared \
diff --git a/libs/fftw/CONFIGURE b/libs/fftw/CONFIGURE
index da719c3..e2b6100 100755
--- a/libs/fftw/CONFIGURE
+++ b/libs/fftw/CONFIGURE
@@ -9,5 +9,5 @@ if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
fi &&
if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ppc" ]]; then
config_query_option FFTW_FLOATOPTS "ppc: enable AltiVec for floats?" n
--enable-altivec --disable-altivec
-fi &&
-config_query_option FFTW_OPTS "Enable opts for fused multiply-add (p.ex.
ppc)?" n --enable-fma --disable-fma
+fi
+#config_query_option FFTW_OPTS "Enable opts for fused multiply-add (p.ex.
ppc)?" n --enable-fma --disable-fma
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index bdc9c63..d32e86e 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,7 @@
+2008-12-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: force fma off
+ * CONFIGURE: don't ask about fma, it is breaking the build now (x86)
+
2008-11-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.2




  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (65cfa07476202d1d995f1cb938f965b53eea2961), Jaka Kranjc, 12/08/2008

Archive powered by MHonArc 2.6.24.

Top of Page