Received: by mail.netbsd.org (Postfix, from userid 605) id 97A4184D55; Fri, 7 May 2021 12:31:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D66C684D23 for ; Fri, 7 May 2021 12:31:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jbQkM_g_6mc4 for ; Fri, 7 May 2021 12:31:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1E6BE84D14 for ; Fri, 7 May 2021 12:31:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1A504FA95; Fri, 7 May 2021 12:31:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1620390683255750" MIME-Version: 1.0 Date: Fri, 7 May 2021 12:31:23 +0000 From: "Dr. Thomas Orgis" Subject: CVS commit: pkgsrc/math/fftw To: pkgsrc-changes@NetBSD.org Reply-To: thor@netbsd.org X-Mailer: log_accum Message-Id: <20210507123123.1A504FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1620390683255750 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: thor Date: Fri May 7 12:31:23 UTC 2021 Modified Files: pkgsrc/math/fftw: Makefile PLIST options.mk Log Message: math/fftw: fix pkglint issues To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 pkgsrc/math/fftw/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/math/fftw/PLIST cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/fftw/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1620390683255750 Content-Disposition: inline Content-Length: 6110 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/fftw/Makefile diff -u pkgsrc/math/fftw/Makefile:1.67 pkgsrc/math/fftw/Makefile:1.68 --- pkgsrc/math/fftw/Makefile:1.67 Fri May 7 11:59:41 2021 +++ pkgsrc/math/fftw/Makefile Fri May 7 12:31:22 2021 @@ -1,19 +1,17 @@ -# $NetBSD: Makefile,v 1.67 2021/05/07 11:59:41 thor Exp $ - -PKGREVISION= 5 - -COMMENT= Collection of fast C routines to compute DFTs +# $NetBSD: Makefile,v 1.68 2021/05/07 12:31:22 thor Exp $ DISTNAME= fftw-3.3.9 +PKGREVISION= 5 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ MASTER_SITES+= http://www.fftw.org/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.fftw.org/ +COMMENT= Collection of fast C routines to compute DFTs LICENSE= gnu-gpl-v2 -SUPERSEDES= fftwf +SUPERSEDES= fftwf-[0-9]* CONFLICTS+= fftwf-[0-9]* USE_LANGUAGES= c @@ -64,10 +62,10 @@ FFTW_DOUBLE_OPTS= --enable-generic-simd1 FFTW_FLOAT_OPTS+= --enable-sse --enable-sse2 --enable-avx FFTW_DOUBLE_OPTS+= --enable-sse2 --enable-avx # From gcc-4.9 on, these should work trouble-free. -.if empty(CC_VERSION:Mgcc-4.8.*) +. if empty(CC_VERSION:Mgcc-4.8.*) FFTW_FLOAT_OPTS+= --enable-avx2 --enable-avx512 --enable-avx-128-fma -FFTW_DOUBLE_OPTS+= --enable-avx2 --enable-avx512 --enable-avx-128-fma -.endif +FFTW_DOUBLE_OPTS+= --enable-avx2 --enable-avx512 --enable-avx-128-fma +. endif .endif # TODO: Add the above for other architectures. @@ -82,21 +80,20 @@ SUBST_SED.hardcore= -e "s,march=core-avx pre-configure: .for d in ${CONFIGURE_DIRS} mkdir -p ${WRKSRC:Q}/${d} -.if ${d} == "build/float" +. if ${d} == "build/float" printf '#!/bin/sh\nexec ../../configure "$$@" --enable-${d:S,build/,,} ${FFTW_FLOAT_OPTS}' \ > ${WRKSRC:Q}/${d}/configure -.elif ${d} == "build/double" +. elif ${d} == "build/double" printf '#!/bin/sh\nexec ../../configure "$$@" ${FFTW_DOUBLE_OPTS}' \ > ${WRKSRC:Q}/${d}/configure -.elif ${d} == "build/quad-precision" +. elif ${d} == "build/quad-precision" printf '#!/bin/sh\nexec ../../configure "$$@" --enable-${d:S,build/,,} --disable-mpi\n' \ > ${WRKSRC:Q}/${d}/configure -.else +. else printf '#!/bin/sh\nexec ../../configure "$$@" --enable-${d:S,build/,,}\n' \ > ${WRKSRC:Q}/${d}/configure -.endif +. endif chmod +x ${WRKSRC:Q}/${d}/configure .endfor .include "../../mk/bsd.pkg.mk" - Index: pkgsrc/math/fftw/PLIST diff -u pkgsrc/math/fftw/PLIST:1.14 pkgsrc/math/fftw/PLIST:1.15 --- pkgsrc/math/fftw/PLIST:1.14 Thu Apr 29 23:30:15 2021 +++ pkgsrc/math/fftw/PLIST Fri May 7 12:31:22 2021 @@ -1,13 +1,15 @@ -@comment $NetBSD: PLIST,v 1.14 2021/04/29 23:30:15 thor Exp $ -bin/fftw-wisdom-to-conf +@comment $NetBSD: PLIST,v 1.15 2021/05/07 12:31:22 thor Exp $ bin/fftw-wisdom +bin/fftw-wisdom-to-conf bin/fftwf-wisdom ${PLIST.long}bin/fftwl-wisdom ${PLIST.quad}bin/fftwq-wisdom +${PLIST.mpi}include/fftw3-mpi.f03 +${PLIST.mpi}include/fftw3-mpi.h include/fftw3.f include/fftw3.f03 include/fftw3.h -${PLIST.mpi}include/fftw3-mpi.h +${PLIST.mpi}include/fftw3l-mpi.f03 include/fftw3l.f03 include/fftw3q.f03 info/fftw3.info @@ -20,22 +22,20 @@ ${PLIST.long}lib/cmake/fftw3/FFTW3lConfi ${PLIST.quad}lib/cmake/fftw3/FFTW3qConfig.cmake ${PLIST.quad}lib/cmake/fftw3/FFTW3qConfigVersion.cmake lib/libfftw3.la -lib/libfftw3f.la -${PLIST.long}lib/libfftw3l.la -${PLIST.quad}lib/libfftw3q.la -${PLIST.pthreads}lib/libfftw3_threads.la -${PLIST.pthreads}lib/libfftw3f_threads.la -${PLIST.pthreads}${PLIST.long}lib/libfftw3l_threads.la -${PLIST.pthreads}${PLIST.quad}lib/libfftw3q_threads.la +${PLIST.mpi}lib/libfftw3_mpi.la ${PLIST.omp}lib/libfftw3_omp.la +${PLIST.pthreads}lib/libfftw3_threads.la +lib/libfftw3f.la +${PLIST.mpi}lib/libfftw3f_mpi.la ${PLIST.omp}lib/libfftw3f_omp.la +${PLIST.pthreads}lib/libfftw3f_threads.la +${PLIST.long}lib/libfftw3l.la +${PLIST.mpi}${PLIST.long}lib/libfftw3l_mpi.la ${PLIST.omp}${PLIST.long}lib/libfftw3l_omp.la +${PLIST.pthreads}${PLIST.long}lib/libfftw3l_threads.la +${PLIST.quad}lib/libfftw3q.la ${PLIST.omp}${PLIST.quad}lib/libfftw3q_omp.la -${PLIST.mpi}lib/libfftw3_mpi.la -${PLIST.mpi}lib/libfftw3f_mpi.la -${PLIST.mpi}${PLIST.long}lib/libfftw3l_mpi.la -${PLIST.mpi}include/fftw3l-mpi.f03 -${PLIST.mpi}include/fftw3-mpi.f03 +${PLIST.pthreads}${PLIST.quad}lib/libfftw3q_threads.la lib/pkgconfig/fftw3.pc lib/pkgconfig/fftw3f.pc ${PLIST.long}lib/pkgconfig/fftw3l.pc Index: pkgsrc/math/fftw/options.mk diff -u pkgsrc/math/fftw/options.mk:1.4 pkgsrc/math/fftw/options.mk:1.5 --- pkgsrc/math/fftw/options.mk:1.4 Thu Apr 29 23:30:15 2021 +++ pkgsrc/math/fftw/options.mk Fri May 7 12:31:22 2021 @@ -1,14 +1,14 @@ -# $NetBSD: options.mk,v 1.4 2021/04/29 23:30:15 thor Exp $ +# $NetBSD: options.mk,v 1.5 2021/05/07 12:31:22 thor Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fftw # fftw (double) and fftwf (single) are always built, you can add # fftwl (long) and fftwq (quad). PKG_SUPPORTED_OPTIONS= fftw-fortran openmp mpi fftw-long fftw-quad # Enable fortran support by default on platforms supported by lang/g95. -.if (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) || \ - !empty(MACHINE_ARCH:Mia64) || !empty(MACHINE_ARCH:Mpowerpc*) || \ - !empty(MACHINE_ARCH:Mhppa) || !empty(MACHINE_ARCH:Msparc*) || \ - !empty(MACHINE_ARCH:Malpha) || !empty(MACHINE_ARCH:Mmips*)) +.if (${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64 || \ + ${MACHINE_ARCH} == ia64 || !empty(MACHINE_ARCH:Mpowerpc*) || \ + ${MACHINE_ARCH} == hppa || !empty(MACHINE_ARCH:Msparc*) || \ + ${MACHINE_ARCH} == alpha || !empty(MACHINE_ARCH:Mmips*)) # ...but disable it until lang/g95 issue is resolved. #PKG_SUGGESTED_OPTIONS= fftw-fortran .endif @@ -21,9 +21,9 @@ USE_LANGUAGES+= fortran77 CONFIGURE_ARGS+= --disable-fortran .endif -PLIST_VARS+= omp +PLIST_VARS+= omp .if !empty(PKG_OPTIONS:Mopenmp) -PLIST.omp= yes +PLIST.omp= yes CONFIGURE_ARGS+= --enable-openmp .endif @@ -38,10 +38,10 @@ PLIST_VARS+= long quad .if !empty(PKG_OPTIONS:Mfftw-long) FFTW_PRECISION+= long-double -PLIST.long= yes +PLIST.long= yes .endif .if !empty(PKG_OPTIONS:Mfftw-quad) FFTW_PRECISION+= quad-precision -PLIST.quad= yes +PLIST.quad= yes .endif --_----------=_1620390683255750--