summaryrefslogtreecommitdiff
path: root/math/fftw3
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2004-05-31 10:13:40 +0000
committerPav Lucistnik <pav@FreeBSD.org>2004-05-31 10:13:40 +0000
commita9a161ba3d681911e2abb43ca1de1caf9fc6496d (patch)
tree8da79641a6a9ec0e369cfa5146686b3befd33776 /math/fftw3
parentPut the .packlist somewhere it won't clash with other ports (diff)
- Performance tweaks: enable SSE2 for libfftw, don't force 16-byte aligned malloc
PR: ports/67393 Submitted by: michael johnson <ahze@ahze.net> (maintainer)
Notes
Notes: svn path=/head/; revision=110506
Diffstat (limited to 'math/fftw3')
-rw-r--r--math/fftw3/Makefile5
-rw-r--r--math/fftw3/files/patch-alloc.c21
2 files changed, 24 insertions, 2 deletions
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 4085f0d76a15..fbde20f55ccc 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -27,11 +27,11 @@ INSTALLS_SHLIB= yes
MAN1= fftw-wisdom-to-conf.1 fftw-wisdom.1 fftwf-wisdom.1
INFO= fftw3
-CONFIGURE_ARGS= --enable-shared --with-our-malloc16
+CONFIGURE_ARGS= --enable-shared
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
# FFTW --enable-single Options
-CONFIGURE_ARGS_FFTW3F=--enable-single ${CONFIGURE_ARGS}
+CONFIGURE_ARGS_FFTW3F=--enable-single ${CONFIGURE_ARGS:N--enable-sse2}
FFTW3F_WRKSRC= ${WRKDIR}/${DISTNAME}-3F
FFTW3F_INSTALL_TARGET=install-pkgconfigDATA install-libLTLIBRARIES install-exec
@@ -54,6 +54,7 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS:N-O:N-O*} -O3 -fomit-frame-pointer -fno-schedul
.endif
.if defined(WITH_SSE)
+CONFIGURE_ARGS+=--enable-sse2
CONFIGURE_ARGS_FFTW3F+=--enable-sse
CONFIGURE_ENV+= CFLAGS="${CFLAGS:N-O:N-O*} -O2"
.endif
diff --git a/math/fftw3/files/patch-alloc.c b/math/fftw3/files/patch-alloc.c
new file mode 100644
index 000000000000..16d35e160353
--- /dev/null
+++ b/math/fftw3/files/patch-alloc.c
@@ -0,0 +1,21 @@
+--- kernel/alloc.c.orig Sun May 30 16:26:22 2004
++++ kernel/alloc.c Sun May 30 16:27:34 2004
+@@ -30,6 +30,8 @@
+ # endif
+ #endif
+
++#include <stdlib.h>
++
+ #if defined(HAVE_DECL_POSIX_MEMALIGN) && !HAVE_DECL_POSIX_MEMALIGN
+ extern int posix_memalign(void **, size_t, size_t);
+ #endif
+@@ -122,9 +124,6 @@
+ # define real_free MPFree
+
+ # else
+- /* Add your machine here and send a patch to fftw@fftw.org
+- or (e.g. for Windows) configure --with-our-malloc16 */
+-# error "Don't know how to malloc() aligned memory."
+ # endif
+
+ #else /* !defined(MIN_ALIGMENT) */