Index: head/math/fftw3/Makefile =================================================================== --- head/math/fftw3/Makefile (revision 559633) +++ head/math/fftw3/Makefile (revision 559634) @@ -1,169 +1,169 @@ # Created by: Lars Koeller # $FreeBSD$ PORTNAME= fftw3 -DISTVERSION= 3.3.8 -PORTREVISION?= 6 +DISTVERSION= 3.3.9 +PORTREVISION?= 0 CATEGORIES= math MASTER_SITES= http://www.fftw.org/ \ ftp://ftp.fftw.org/pub/fftw/ PKGNAMESUFFIX= ${FFTW3_PKGNAMESUFFIX} DISTNAME= fftw-${DISTVERSION} MAINTAINER= jhale@FreeBSD.org COMMENT?= Fast C routines to compute the Discrete Fourier Transform LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING #current flavors: default, float, long, and quad FFTW3_FLAVOR?= default FFTW3_SUFX= GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= smallcheck #bigcheck check exhaustive-check paranoid-check TEST_WRKSRC= ${WRKSRC}/tests USES= gmake libtool makeinfo pathfix perl5 pkgconfig USE_PERL5= build USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-threads --disable-fortran MPIDIR?= ${LOCALBASE}/mpi/openmpi .if ${FFTW3_FLAVOR} == "default" INFO= fftw3 .else #For non-default flavors, build and install the flavor-dependent components #only, so that these flavors may coexist with the default flavor INSTALL_TARGET= install-cmakeDATA install-pkgconfigDATA install-libLTLIBRARIES install-exec .endif OPTIONS_DEFINE= G77_WRAPPERS OPENMP OPENMPI OPTIMIZED_CFLAGS SIMD OPTIONS_DEFAULT= OPTIMIZED_CFLAGS SIMD .if ${FFTW3_FLAVOR} == "quad" OPTIONS_EXCLUDE+= OPENMPI .endif OPTIONS_SUB= yes G77_WRAPPERS_DESC= Alter Fortran wrappers for use with g77 OPENMP_DESC= Build OpenMP multithreaded libraries OPENMP_USES= compiler:openmp OPENMP_USES_OFF= compiler:env OPENMP_CONFIGURE_ENABLE= openmp OPENMP_EXTRA_PATCHES= ${FILESDIR}/extrapatch-tests_fftw-bench.c OPENMPI_DESC= Build OpenMPI parallel libraries OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi OPENMPI_CONFIGURE_ENABLE= mpi OPENMPI_CONFIGURE_ENV= MPICC=${MPIDIR}/bin/mpicc \ MPIRUN=${MPIDIR}/bin/mpirun .include # Enable cycle counter via the CNTVCT_EL0 register for all variants on arm64. .if ${ARCH} == "aarch64" CONFIGURE_ARGS+=--enable-armv8-cntvct-el0 .endif #Users must add altivec to MACHINE_CPU when desired: #this is not currently done in bsd.cpu.mk .if ${FFTW3_FLAVOR} == "default" . if ${PORT_OPTIONS:MSIMD} . if !empty(MACHINE_CPU:Mavx) CONFIGURE_ARGS+=--enable-avx . endif . if !empty(MACHINE_CPU:Mavx2) CONFIGURE_ARGS+=--enable-avx2 --enable-fma . endif . if !empty(MACHINE_CPU:Msse2) CONFIGURE_ARGS+=--enable-sse2 . endif . endif .elif ${FFTW3_FLAVOR} == "float" FFTW3_SUFX= f FFTW3_PKGNAMESUFFIX= -float CONFIGURE_ARGS+=--enable-float . if ${PORT_OPTIONS:MSIMD} . if !empty(MACHINE_CPU:Mavx) CONFIGURE_ARGS+=--enable-avx . endif . if !empty(MACHINE_CPU:Mavx2) CONFIGURE_ARGS+=--enable-avx2 --enable-fma . endif . if !empty(MACHINE_CPU:Msse) CONFIGURE_ARGS+=--enable-sse2 . endif . if !empty(ARCH:Mpowerpc*) && !empty(MACHINE_CPU:Maltivec) CONFIGURE_ARGS+=--enable-altivec . endif . if ${ARCH} == "aarch64" CONFIGURE_ARGS+=--enable-neon . endif . endif .elif ${FFTW3_FLAVOR} == "long" FFTW3_SUFX= l FFTW3_PKGNAMESUFFIX= -long CONFIGURE_ARGS+=--enable-long-double .elif ${FFTW3_FLAVOR} == "quad" FFTW3_SUFX= q FFTW3_PKGNAMESUFFIX= -quad CONFIGURE_ARGS+=--enable-quad-precision ONLY_FOR_ARCHS= i386 amd64 USE_GCC= yes .endif .if ${FFTW3_FLAVOR} == "default" PLIST_SUB+= DEF="" NONDEF="@comment " .else PLIST_SUB+= DEF="@comment " NONDEF="" .endif PLIST_SUB+= FFTW3_SUFX="${FFTW3_SUFX}" .include .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -fstrict-aliasing . if !defined(WITH_DEBUG) CFLAGS+= -fomit-frame-pointer . endif . if ${ARCH} == "i386" && (${COMPILER_TYPE} == "gcc" || !empty(USE_GCC)) && !${PORT_OPTIONS:MOPENMPI} CFLAGS+= -malign-double . endif WITHOUT_NO_STRICT_ALIASING= yes .endif # end OPTIMIZED_CFLAGS post-patch: @${REINPLACE_CMD} -e 's|/etc/fftw|${PREFIX}/etc/fftw|' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/api/import-system-wisdom.c \ ${WRKSRC}/doc/fftw3* \ ${WRKSRC}/tools/* .if ${FFTW3_FLAVOR} != "default" @${REINPLACE_CMD} -E \ -e '/(DIST_COMMON|bin_SCRIPTS|BUILT_SOURCES|EXTRA_DIST) =/,\ /[^\]$$/s/[^[:blank:]]*fftw-wisdom-to-conf[^[:blank:]]*//' \ ${WRKSRC}/tools/Makefile.in .endif post-configure: #After issuing --disable-fortran in order to avoid using a Fortran compiler #during configuration, edit config.h to provide Fortran wrappers appropriate for #gfortran, with ac_cv_f77_mangling="lower case, underscore, no extra underscore" @${REINPLACE_CMD} -e '/DISABLE_FORTRAN/d' ${WRKSRC}/config.h @${ECHO_CMD} "#define F77_FUNC(name,NAME) name ## _" >> ${WRKSRC}/config.h @${ECHO_CMD} "#define F77_FUNC_(name,NAME) name ## _" >> ${WRKSRC}/config.h @${ECHO_CMD} "#define F77_FUNC_EQUIV 1" >> ${WRKSRC}/config.h post-configure-G77_WRAPPERS-on: @${ECHO_CMD} "#define WITH_G77_WRAPPERS 1" >> ${WRKSRC}/config.h .if ${FFTW3_FLAVOR} != "default" post-install: ${INSTALL_MAN} ${WRKSRC}/tools/fftw${FFTW3_SUFX}-wisdom.1 ${STAGEDIR}${PREFIX}/man/man1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so .endif .include Index: head/math/fftw3/distinfo =================================================================== --- head/math/fftw3/distinfo (revision 559633) +++ head/math/fftw3/distinfo (revision 559634) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532686553 -SHA256 (fftw-3.3.8.tar.gz) = 6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303 -SIZE (fftw-3.3.8.tar.gz) = 4110137 +TIMESTAMP = 1609250043 +SHA256 (fftw-3.3.9.tar.gz) = bf2c7ce40b04ae811af714deb512510cc2c17b9ab9d6ddcf49fe4487eea7af3d +SIZE (fftw-3.3.9.tar.gz) = 4146999 Index: head/math/fftw3/files/extrapatch-tests_fftw-bench.c =================================================================== --- head/math/fftw3/files/extrapatch-tests_fftw-bench.c (revision 559633) +++ head/math/fftw3/files/extrapatch-tests_fftw-bench.c (revision 559634) @@ -1,11 +1,12 @@ Fix regression tests when OPENMP option is enabled. ---- tests/fftw-bench.c.orig 2016-10-25 22:27:48 UTC +--- tests/fftw-bench.c.orig 2020-12-10 12:02:44 UTC +++ tests/fftw-bench.c -@@ -110,7 +110,6 @@ void rdwisdom(void) +@@ -125,8 +125,6 @@ void rdwisdom(void) if (threads_ok) { BENCH_ASSERT(FFTW(init_threads)()); FFTW(plan_with_nthreads)(nthreads); +- BENCH_ASSERT(FFTW(planner_nthreads)() == nthreads); - FFTW(make_planner_thread_safe)(); #ifdef _OPENMP omp_set_num_threads(nthreads); #endif Index: head/math/fftw3/files/patch-configure =================================================================== --- head/math/fftw3/files/patch-configure (revision 559633) +++ head/math/fftw3/files/patch-configure (revision 559634) @@ -1,11 +1,11 @@ ---- configure.orig 2016-07-30 20:34:50 UTC +--- configure.orig 2020-12-30 00:12:14 UTC +++ configure -@@ -14397,7 +14397,7 @@ fi +@@ -14937,7 +14937,7 @@ fi esac case "${ax_cv_c_compiler_vendor}" in - gnu|intel) + gnu|intel|clang) - # SSE/SSE2 - if test "$have_sse2" = "yes" -a "x$SSE2_CFLAGS" = x; then - if test "$PRECISION" = d; then flag=msse2; else flag=msse; fi + # SSE/SSE2 + if test "$have_sse2" = "yes" -a "x$SSE2_CFLAGS" = x; then + if test "$PRECISION" = d; then flag=msse2; else flag=msse; fi Index: head/math/fftw3/pkg-plist =================================================================== --- head/math/fftw3/pkg-plist (revision 559633) +++ head/math/fftw3/pkg-plist (revision 559634) @@ -1,32 +1,32 @@ bin/fftw%%FFTW3_SUFX%%-wisdom %%DEF%%bin/fftw-wisdom-to-conf %%DEF%%%%OPENMPI%%include/fftw3-mpi.f03 %%DEF%%%%OPENMPI%%include/fftw3-mpi.h %%DEF%%include/fftw3.f %%DEF%%include/fftw3.f03 %%DEF%%include/fftw3.h %%DEF%%%%OPENMPI%%include/fftw3l-mpi.f03 %%DEF%%include/fftw3l.f03 %%DEF%%include/fftw3q.f03 lib/cmake/fftw3/FFTW3%%FFTW3_SUFX%%Config.cmake lib/cmake/fftw3/FFTW3%%FFTW3_SUFX%%ConfigVersion.cmake lib/libfftw3%%FFTW3_SUFX%%.a lib/libfftw3%%FFTW3_SUFX%%.so lib/libfftw3%%FFTW3_SUFX%%.so.3 -lib/libfftw3%%FFTW3_SUFX%%.so.3.5.8 +lib/libfftw3%%FFTW3_SUFX%%.so.3.6.9 %%OPENMPI%%lib/libfftw3%%FFTW3_SUFX%%_mpi.a %%OPENMPI%%lib/libfftw3%%FFTW3_SUFX%%_mpi.so %%OPENMPI%%lib/libfftw3%%FFTW3_SUFX%%_mpi.so.3 -%%OPENMPI%%lib/libfftw3%%FFTW3_SUFX%%_mpi.so.3.5.8 +%%OPENMPI%%lib/libfftw3%%FFTW3_SUFX%%_mpi.so.3.6.9 %%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.a %%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.so %%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.so.3 -%%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.so.3.5.8 +%%OPENMP%%lib/libfftw3%%FFTW3_SUFX%%_omp.so.3.6.9 lib/libfftw3%%FFTW3_SUFX%%_threads.a lib/libfftw3%%FFTW3_SUFX%%_threads.so lib/libfftw3%%FFTW3_SUFX%%_threads.so.3 -lib/libfftw3%%FFTW3_SUFX%%_threads.so.3.5.8 +lib/libfftw3%%FFTW3_SUFX%%_threads.so.3.6.9 libdata/pkgconfig/fftw3%%FFTW3_SUFX%%.pc %%DEF%%man/man1/fftw-wisdom.1.gz %%DEF%%man/man1/fftw-wisdom-to-conf.1.gz %%NONDEF%%man/man1/fftw%%FFTW3_SUFX%%-wisdom.1.gz