[hamradio-commits] [wsjtx] 08/09: More FORTRAN include fixes

[Iain R. Learmonth]

This is an automated email from the git hooks/post-receive script.

irl pushed a commit to branch master
in repository wsjtx.

commit 6f1cfad81fbaf73773298a7c1f30e56a1cfdc36d
Author: Iain R. Learmonth <irl at debian.org>
Date:   Sun Oct 18 20:22:34 2015 +0100

    More FORTRAN include fixes
---
 debian/patches/0005-fix-fftw3-includes.patch   | 77 --------------------------
 debian/patches/0005-fix-fortran-includes.patch | 19 +++++++
 debian/patches/series                          |  2 +-
 3 files changed, 20 insertions(+), 78 deletions(-)

diff --git a/debian/patches/0005-fix-fftw3-includes.patch b/debian/patches/0005-fix-fftw3-includes.patch
deleted file mode 100644
index 0587f17..0000000
--- a/debian/patches/0005-fix-fftw3-includes.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/lib/chkfft2.f90
-+++ b/lib/chkfft2.f90
-@@ -1,7 +1,7 @@
- program chkfft
- 
- ! Tests and times one-dimensional FFTs computed by FFTW3
--  use FFTW3
-+  include 'fftw3.f03'
-   parameter (NMAX=8*1024*1024)           !Maximum FFT length
-   complex a(NMAX),b(NMAX),c(NMAX)
-   real ar(NMAX),br(NMAX),cr(NMAX)
---- a/lib/chkfft3.f90
-+++ b/lib/chkfft3.f90
-@@ -2,7 +2,7 @@
- 
- ! Tests and times one-dimensional FFTs computed by FFTW3
-   use, intrinsic :: iso_c_binding
--  use FFTW3
-+  include 'fftw3.f03'
-   parameter (NMAX=8*1024*1024)           !Maximum FFT length
-   complex a(NMAX),b(NMAX),c(NMAX)
-   real ar(NMAX),br(NMAX),cr(NMAX)
---- a/lib/downsam9.f90
-+++ b/lib/downsam9.f90
-@@ -4,7 +4,7 @@
- !mixing from fpk down to zero frequency.  The downsample factor is 432.
- 
-   use, intrinsic :: iso_c_binding
--  use FFTW3
-+  include 'fftw3.f03'
- 
-   include 'constants.f90'
-   integer(C_SIZE_T) NMAX1
---- a/lib/filbig.f90
-+++ b/lib/filbig.f90
-@@ -4,7 +4,7 @@
- ! Output is complex, sampled at 1378.125 Hz.
- 
-   use, intrinsic :: iso_c_binding
--  use FFTW3
-+  include 'fftw3.f03'
- 
-   parameter (NSZ=3413)
-   parameter (NFFT1=672000,NFFT2=77175)
---- a/lib/jt9.f90
-+++ b/lib/jt9.f90
-@@ -6,7 +6,7 @@
-   use options
-   use prog_args
-   use, intrinsic :: iso_c_binding
--  use FFTW3
-+  include 'fftw3.f03'
- 
-   include 'constants.f90'
-   integer(C_INT) iret
---- a/lib/timefft.f90
-+++ b/lib/timefft.f90
-@@ -3,7 +3,7 @@
- ! Tests and times one-dimensional FFTs computed by FFTW3
- 
-   use, intrinsic :: iso_c_binding
--  use FFTW3
-+  include 'fftw3.f03'
- 
-   complex(C_FLOAT_COMPLEX),pointer :: a(:),b(:),c(:)
-   real(C_FLOAT),pointer :: ar(:),br(:)
---- a/lib/timefft_opts.f90
-+++ b/lib/timefft_opts.f90
-@@ -1,7 +1,7 @@
- subroutine timefft_opts(npatience,nthreads,linplace,lcomplex,nfft,    &
-      problem,nflags)
- 
--  use FFTW3
-+  include 'fftw3.f03'
- 
-   logical linplace,lcomplex
-   character problem*9,arg*12
diff --git a/debian/patches/0005-fix-fortran-includes.patch b/debian/patches/0005-fix-fortran-includes.patch
new file mode 100644
index 0000000..34e1677
--- /dev/null
+++ b/debian/patches/0005-fix-fortran-includes.patch
@@ -0,0 +1,19 @@
+--- a/lib/fftw3mod.f90
++++ b/lib/fftw3mod.f90
+@@ -1,4 +1,4 @@
+ module FFTW3
+   use, intrinsic :: iso_c_binding
+-  include 'fftw3.f03'
++  include '/usr/include/fftw3.f03'
+ end module FFTW3
+--- a/lib/Makefile.linux
++++ b/lib/Makefile.linux
+@@ -29,7 +29,7 @@
+ 
+ all:    libjt9.a jt9sim jt9 jt9code jt65code
+ 
+-OBJS1 = astrosub.o astro0.o astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \
++OBJS1 = fftw3mod.o wavhdr.o astrosub.o astro0.o astro.o tm2.o sun.o moondop.o coord.o tmoonsub.o \
+         fmtmsg.o geocentric.o moon2.o toxyz.o dot.o dcoord.o \
+         prog_args.o options.o pctile.o graycode.o sort.o chkmsg.o \
+ 	unpackmsg.o igray.o unpackcall.o unpackgrid.o \
diff --git a/debian/patches/series b/debian/patches/series
index 1b83bef..1ca433d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@
 0002-add-manpage.patch
 0003-no-escape-buildroot.patch
 0004-inherit-cflags-fflags.patch
-0005-fix-fftw3-includes.patch
+0005-fix-fortran-includes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/wsjtx.git