Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e4f19407dc64a06bc30b6cbc410c358801f236b5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e4f19407dc64a06bc30b6cbc410c358801f236b5)
  • Date: Thu, 29 Apr 2021 17:02:22 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

libs/fftw/BUILD | 14 ++++++++------
libs/fftw/DETAILS | 3 ---
libs/fftw/HISTORY | 5 +++++
libs/fftw/INSTALL | 2 +-
libs/fftw/PRE_BUILD | 14 --------------
5 files changed, 14 insertions(+), 24 deletions(-)

New commits:
commit e4f19407dc64a06bc30b6cbc410c358801f236b5
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fftw: simplify build

diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index 281604a..c717c4d 100755
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -39,19 +39,21 @@ esac &&

# Build each precision by itself.
for p in $FFTW_PRECISION; do
+ bdir="$SOURCE_DIRECTORY/build/$p" &&
+ mkdir -p "$bdir" &&
case "$p" in
double)
- OPTS="$COMMON_OPTS $DOUBLE_OPTS" &&
- cd "$SOURCE_DIRECTORY/double"
+ OPTS="$COMMON_OPTS $DOUBLE_OPTS"
;;
single)
- OPTS="$COMMON_OPTS $SINGLE_OPTS --enable-float" &&
- cd "$SOURCE_DIRECTORY/$p"
+ OPTS="$COMMON_OPTS $SINGLE_OPTS --enable-float"
;;
longdouble)
- OPTS="$COMMON_OPTS --enable-long-double" &&
- cd "$SOURCE_DIRECTORY/$p"
+ OPTS="$COMMON_OPTS --enable-long-double"
;;
esac &&
+ cd $bdir &&
+ printf '#!/bin/sh\nexec ../../configure "$@"\n' > configure &&
+ chmod +x configure &&
default_build || exit 1
done
diff --git a/libs/fftw/DETAILS b/libs/fftw/DETAILS
index 6d739bb..ff7e845 100755
--- a/libs/fftw/DETAILS
+++ b/libs/fftw/DETAILS
@@ -3,9 +3,6 @@

SOURCE_HASH=sha512:52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-# HACK: incrememnting the version to enable triggering with the changed
build.
-# Remove this line on the next upgrade past 3.3.8!
- VERSION=${VERSION}smgl1
SOURCE_URL[0]=https://www.fftw.org/$SOURCE
SOURCE_URL[1]=ftp://ftp.fftw.org/pub/$SPELL/$SOURCE
LICENSE[0]=GPL
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index e4cfa22..66568a9 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,8 @@
+2021-04-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: remove version hack
+ * PRE_BUILD: gone
+ * BUILD, INSTALL: simplified, out-of-tree builds
+
2020-12-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.3.9

diff --git a/libs/fftw/INSTALL b/libs/fftw/INSTALL
index 500a3c0..747e7a1 100755
--- a/libs/fftw/INSTALL
+++ b/libs/fftw/INSTALL
@@ -1,4 +1,4 @@
for p in $FFTW_PRECISION; do
- cd "$SOURCE_DIRECTORY/$p" &&
+ cd "$SOURCE_DIRECTORY/build/$p" &&
default_install || exit 1
done
diff --git a/libs/fftw/PRE_BUILD b/libs/fftw/PRE_BUILD
deleted file mode 100755
index 80a2a71..0000000
--- a/libs/fftw/PRE_BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-mk_source_dir "$SOURCE_DIRECTORY" &&
-cd "$SOURCE_DIRECTORY" &&
-unpack_file &&
-mv fftw-* double &&
-for p in $FFTW_PRECISION; do
- case "$p" in
- double)
- # the default build
- ;;
- *)
- cp -r double "$p"
- ;;
- esac
-done



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e4f19407dc64a06bc30b6cbc410c358801f236b5), Thomas Orgis, 04/29/2021

Archive powered by MHonArc 2.6.24.

Top of Page