diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2004-12-09 19:21:04 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2004-12-09 19:21:04 +0000 |
| commit | 34fd254c7690ca030e070c88dfbb1ccd7afe450d (patch) | |
| tree | 2c71a49de90c2a9fa38c14e051326ce45586fec4 /math | |
| parent | Fix a problem with the pkg-plist which failed to remove some directories (diff) | |
- Add note about WITH_OPTIMIZED_ATHLON will fall back to 3dNow if you don't have
a Athlon
- Fix man pages so they say ${PREFIX}/etc instead of /etc
- Fix core dump of fftw-wisdom in >=5.x [1] by removing a dirty work around
to use a 16-byte aligned maloc by really using freebsd's 16-byte
aligned maloc
Reported by: phk
Notes
Notes:
svn path=/head/; revision=123577
Diffstat (limited to 'math')
| -rw-r--r-- | math/fftw3/Makefile | 6 | ||||
| -rw-r--r-- | math/fftw3/files/patch-alloc.c | 27 |
2 files changed, 12 insertions, 21 deletions
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index 206b866cf84a..04ab626d681d 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -7,7 +7,7 @@ PORTNAME= fftw3 PORTVERSION= 3.0.1 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ http://www.fftw.org/ \ @@ -44,7 +44,7 @@ INSTALL_TARGET= install-pkgconfigDATA install-libLTLIBRARIES install-exec OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off \ SMP_THREADS "Enable FFTW SMP threads library" off \ - OPTIMIZED_ATHLON "Enable AMD K7(Athlon) optimizations" off \ + OPTIMIZED_ATHLON "Enable AMD Athlon/3dNow! optimizations" off \ SSE "Enable SSE optimized routines" off .include <bsd.port.pre.mk> @@ -109,7 +109,7 @@ post-patch: ${WRKSRC}/Makefile.in \ ${WRKSRC}/api/import-system-wisdom.c \ ${WRKSRC}/doc/fftw3* \ - ${WRKSRC}/tools/fftw*wisdom.1 + ${WRKSRC}/tools/* @${FIND} ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \; .if defined(FFTW3_FLAVOR) && ${FFTW3_FLAVOR}!="default" @${REINPLACE_CMD} -e \ diff --git a/math/fftw3/files/patch-alloc.c b/math/fftw3/files/patch-alloc.c index 16d35e160353..0294284563ef 100644 --- a/math/fftw3/files/patch-alloc.c +++ b/math/fftw3/files/patch-alloc.c @@ -1,21 +1,12 @@ ---- 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 +--- kernel/alloc.c.orig Sat Mar 15 15:29:43 2003 ++++ kernel/alloc.c Thu Dec 9 03:31:56 2004 +@@ -79,6 +79,9 @@ + # undef real_free + # define real_free our_free16 -+#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 ++# elif defined(__FreeBSD__) ++ p = malloc(n); + # elif defined(HAVE_MEMALIGN) + p = memalign(MIN_ALIGNMENT, n); - # 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) */ |