Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test grimoire by Jaka Kranjc (2583fb8fb9392aad5b0bfa17fc0485a2edf487cf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test grimoire by Jaka Kranjc (2583fb8fb9392aad5b0bfa17fc0485a2edf487cf)
  • Date: Sat, 3 Jun 2006 10:24:09 -0500

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

dev/null |binary
libs/fftw/BUILD | 32 ++++++++++++++++++++++++++++----
libs/fftw/CONFIGURE | 3 ++-
libs/fftw/DETAILS | 4 ++--
libs/fftw/HISTORY | 8 ++++++++
libs/fftw/INSTALL | 10 ++++++----
libs/fftw/PRE_BUILD | 4 +++-
libs/fftw/fftw-3.1.tar.gz.sig | 0
8 files changed, 49 insertions(+), 12 deletions(-)

New commits:
commit 2583fb8fb9392aad5b0bfa17fc0485a2edf487cf
Merge: e1e6263... b2422d3...
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Merge branch 'master' of http://scm.sourcemage.org/smgl/grimoire

commit e1e6263022af29ec8ba0ce03eeacd7b1693b6e42
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

fftw: fixed #12592
maybe it would be good to split this up in 3 spells, similar to fftw2

diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index d31c143..3adf54b 100755
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -1,17 +1,41 @@
+if list_find "$CFLAGS" sse2; then
+ DOUBLEOPTS="$DOUBLEOPTS --enable-sse2"
+fi
+if list_find "$CFLAGS" sse; then
+ FLOATOPTS="$FLOATOPTS --enable-sse"
+fi
+if list_find "$CFLAGS" altivec; then
+ FLOATOPTS="$FLOATOPTS --enable-altivec"
+fi
+if list_find "$CFLAGS" 3dnow; then
+ FLOATOPTS="$FLOATOPTS --enable-k7"
+fi
+if list_find "$CFLAGS" powerpc; then
+ OPTS="$OPTS --enable-fma"
+fi
+if [[ $FORTRAN == "n" ]]; then
+ OPTS="$OPTS --disable-fortran"
+fi
+CFLAGS="${CFLAGS/-Os/}"
OPTS="$OPTS $FFTW_THREADS" &&

cd $SOURCE_DIRECTORY/fftw-single-$VERSION &&
./configure --prefix=${INSTALL_ROOT}/usr \
--enable-shared \
- --enable-single \
- --enable-i386-hacks \
+ --enable-float \
--enable-type-prefix \
- $OPTS &&
+ $OPTS $FLOATOPTS &&
make &&
cd $SOURCE_DIRECTORY/fftw-double-$VERSION &&
./configure --prefix=${INSTALL_ROOT}/usr \
--enable-shared \
- --enable-i386-hacks \
+ --enable-type-prefix \
+ $OPTS $DOUBLEOPTS &&
+make &&
+cd $SOURCE_DIRECTORY/fftw-longdouble-$VERSION &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --enable-shared \
+ --enable-long-double \
--enable-type-prefix \
$OPTS &&
make
diff --git a/libs/fftw/CONFIGURE b/libs/fftw/CONFIGURE
index 8baeb2f..8033d4f 100755
--- a/libs/fftw/CONFIGURE
+++ b/libs/fftw/CONFIGURE
@@ -1,5 +1,6 @@
config_query_option FFTW_THREADS "Compile FFTW SMP threads library" n \
"--enable-threads --with-combined-threads" \
- "--disable-threads --without-combined-threads"
+ "--disable-threads --without-combined-threads" &&

+config_query FORTRAN "Compile in fortran bindings?" n

diff --git a/libs/fftw/DETAILS b/libs/fftw/DETAILS
index c362e33..04c909a 100755
--- a/libs/fftw/DETAILS
+++ b/libs/fftw/DETAILS
@@ -1,9 +1,9 @@
SPELL=fftw
- VERSION=3.1
+ VERSION=3.1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.fftw.org/pub/fftw/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:a6804d84bfc731916a8f6f3b33987de35e5644f449c660559dceb64792859d992c5165342e7d1d6042a307846586aad13738e172c6a68ca4685b43c9d0f514e4
LICENSE[0]=GPL
WEB_SITE=http://www.fftw.org/
ENTERED=20011207
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index 4fc305a..c218e45 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,11 @@
+2006-06-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * Applied modified patch from Florian Franzmann, thanks! #12592
+ * BUILD: Added architecture specific optimizations
+ * BUILD, INSTALL, PRE_BUILD: Added longdouble version
+ * CONFIGURE, BUILD: Made fortran bindings optional
+ * BUILD: remove -Os from CFLAGS according to fftw documentation
+ * DETAILS: Updated to version 3.1.1
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/libs/fftw/INSTALL b/libs/fftw/INSTALL
index 0c79052..83cec70 100755
--- a/libs/fftw/INSTALL
+++ b/libs/fftw/INSTALL
@@ -1,4 +1,6 @@
-cd $SOURCE_DIRECTORY/fftw-single-$VERSION &&
-make install &&
-cd $SOURCE_DIRECTORY/fftw-double-$VERSION &&
-make install
+cd $SOURCE_DIRECTORY/fftw-single-$VERSION &&
+default_install &&
+cd $SOURCE_DIRECTORY/fftw-double-$VERSION &&
+default_install &&
+cd $SOURCE_DIRECTORY/fftw-longdouble-$VERSION &&
+default_install
diff --git a/libs/fftw/PRE_BUILD b/libs/fftw/PRE_BUILD
index 2f1d453..19b3f9b 100755
--- a/libs/fftw/PRE_BUILD
+++ b/libs/fftw/PRE_BUILD
@@ -3,4 +3,6 @@ cd $SOURCE_DIRECTORY &&
unpack_file &&
mv $SOURCE_DIRECTORY/fftw-$VERSION $SOURCE_DIRECTORY/fftw-single-$VERSION &&
unpack_file &&
-mv $SOURCE_DIRECTORY/fftw-$VERSION $SOURCE_DIRECTORY/fftw-double-$VERSION
+mv $SOURCE_DIRECTORY/fftw-$VERSION $SOURCE_DIRECTORY/fftw-double-$VERSION &&
+unpack_file &&
+mv $SOURCE_DIRECTORY/fftw-$VERSION $SOURCE_DIRECTORY/fftw-longdouble-$VERSION
diff --git a/libs/fftw/fftw-3.1.tar.gz.sig b/libs/fftw/fftw-3.1.tar.gz.sig
deleted file mode 100644
index fbedc1f..0000000
Binary files a/libs/fftw/fftw-3.1.tar.gz.sig and /dev/null differ



  • [SM-Commit] GIT changes to test grimoire by Jaka Kranjc (2583fb8fb9392aad5b0bfa17fc0485a2edf487cf), Jaka Kranjc, 06/03/2006

Archive powered by MHonArc 2.6.24.

Top of Page