1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00

- 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
This commit is contained in:
Michael Johnson 2004-12-09 19:21:04 +00:00
parent 9f9178ee21
commit 34fd254c76
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=123577
2 changed files with 12 additions and 21 deletions

View File

@ -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 \

View File

@ -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) */