Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (320d9de8119c25166ac3e73695a3a3c37aa5f582)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (320d9de8119c25166ac3e73695a3a3c37aa5f582)
  • Date: Thu, 10 Feb 2011 12:45:08 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

libs/fftw/BUILD | 38 ++++++++++++++++++--------------------
libs/fftw/HISTORY | 3 +++
2 files changed, 21 insertions(+), 20 deletions(-)

New commits:
commit 20c34c7e7926ccb1bd9b023d055528ae4aea8e9a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/fftw: cleaned up so default_build is used in BUILD

diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index 219c6b8..8e66b2b 100755
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -2,24 +2,22 @@ if [[ $FORTRAN == "n" ]]; then
OPTS="$OPTS --disable-fortran"
fi &&
CFLAGS="${CFLAGS/-Os/}" &&
+
OPTS="$OPTS $FFTW_THREADS $FFTW_OPTS --disable-fma" &&
-cd $SOURCE_DIRECTORY/fftw-single-$VERSION &&
-./configure --prefix=${INSTALL_ROOT}/usr \
- --enable-shared \
- --enable-float \
- --enable-type-prefix \
- $OPTS $FFTW_FLOATOPTS &&
-make &&
-cd $SOURCE_DIRECTORY/fftw-double-$VERSION &&
-./configure --prefix=${INSTALL_ROOT}/usr \
- --enable-shared \
- --enable-type-prefix \
- $OPTS $FFTW_DOUBLEOPTS &&
-make &&
-cd $SOURCE_DIRECTORY/fftw-longdouble-$VERSION &&
-./configure --prefix=${INSTALL_ROOT}/usr \
- --enable-shared \
- --enable-long-double \
- --enable-type-prefix \
- $OPTS &&
-make
+OPTS="$OPTS --enable-shared" &&
+OPTS="$OPTS --enable-type-prefix" &&
+
+COMMON_OPTS="${OPTS}" &&
+
+
+cd $SOURCE_DIRECTORY/fftw-single-$VERSION &&
+OPTS="$COMMON_OPTS --enable-float $FFTW_FLOATOPTS" &&
+default_build &&
+
+cd $SOURCE_DIRECTORY/fftw-double-$VERSION &&
+OPTS="$COMMON_OPTS $FFTW_DOUBLEOPTS" &&
+default_build &&
+
+cd $SOURCE_DIRECTORY/fftw-longdouble-$VERSION &&
+OPTS="$COMMON_OPTS --enable-long-double" &&
+default_build
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index 4b6d34a..2edcccb 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,6 @@
+2011-02-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: cleaned up so default_build is used
+
2009-07-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.2.2




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (320d9de8119c25166ac3e73695a3a3c37aa5f582), Florian Franzmann, 02/10/2011

Archive powered by MHonArc 2.6.24.

Top of Page