1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
|
From: Ole Streicher <olebole@debian.org>
Date: Thu, 23 Jul 2020 10:46:34 +0200
Subject: Don't fail on argument mismatch when compiling F77 tests
This is a short-term fix until upstream fixed this in the sources.
Closes: #957925
---
Fortran/GNUmakefile | 8 ++++----
pgsbox/GNUmakefile | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Fortran/GNUmakefile b/Fortran/GNUmakefile
index 99abea9..ad8ef9b 100644
--- a/Fortran/GNUmakefile
+++ b/Fortran/GNUmakefile
@@ -328,24 +328,24 @@ tests : $(TESTS)
$(TEST_N) : % : test/%.f $(WCSLIB)
-@ echo ''
- $(FC) $(FFLAGS) -o $@ $< $(LDFLAGS) $(WCSLIB) $(LIBS)
+ $(FC) $(FFLAGS) -fallow-argument-mismatch -o $@ $< $(LDFLAGS) $(WCSLIB) $(LIBS)
-@ $(RM) $@.o
$(TEST_P) : % : test/%.f $(WCSLIB)
-@ echo ''
- $(FC) $(FFLAGS) -o $@ $< $(LDFLAGS) $(WCSLIB) $(PGPLOTLIB) $(LIBS)
+ $(FC) $(FFLAGS) -fallow-argument-mismatch -o $@ $< $(LDFLAGS) $(WCSLIB) $(PGPLOTLIB) $(LIBS)
-@ $(RM) $@.o
tpih2 : % : test/%.f $(PGSBOXLIB) $(WCSLIB)
-@ echo ''
- $(FC) $(FFLAGS) -o $@ $< $(LDFLAGS) $(PGSBOXLIB) $(WCSLIB) \
+ $(FC) $(FFLAGS) -fallow-argument-mismatch -o $@ $< $(LDFLAGS) $(PGSBOXLIB) $(WCSLIB) \
$(PGPLOTLIB) $(LIBS)
-@ $(RM) $@.o
twcstab : test/twcstab.f getwcstab_f.o getwcstab.inc $(FGETWCSTAB) \
$(WCSLIB)
-@ echo ''
- $(FC) $(FFLAGS) -o $@ $< getwcstab_f.o $(FGETWCSTAB) \
+ $(FC) $(FFLAGS) -fallow-argument-mismatch -o $@ $< getwcstab_f.o $(FGETWCSTAB) \
$(LDFLAGS) $(CFITSIOLIB) $(WCSLIB) $(LIBS)
-@ $(RM) $@.o $(FGETWCSTAB)
diff --git a/pgsbox/GNUmakefile b/pgsbox/GNUmakefile
index 4d7c208..fc69c4e 100644
--- a/pgsbox/GNUmakefile
+++ b/pgsbox/GNUmakefile
@@ -239,7 +239,7 @@ $(WCSLIB) :
pgtest : pgtest.f fscan.f lngvel.f $(PGSBOXLIB) $(WCSLIB)
-@ $(RM) $@
-@ echo ''
- $(FC) -I../Fortran $(FFLAGS) -o $@ $^ $(LDFLAGS) \
+ $(FC) -I../Fortran $(FFLAGS) -fallow-argument-mismatch -o $@ $^ $(LDFLAGS) \
$(PGPLOTLIB) $(LIBS)
cpgtest : cpgtest.c fscan.f lngvel.f $(PGSBOXLIB) $(WCSLIB)
|