[blas] 01/02: On any-i386 and m68k, compile test programs with -ffloat-store.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository blas.

commit a703723afcecb5580e312f9769a05759d3b9d4f7
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Sep 23 17:42:37 2014 +0200

    On any-i386 and m68k, compile test programs with -ffloat-store.
    
    This has become necessary with gfortran 4.9 (maybe because the -fno-whole-file
    option has been removed, though I don't really understand the interaction of
    both options).
    
    Closes: #762484
    Git-Dch: Full
---
 debian/rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 10a0861..629a358 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ BUILDFLAGS_ENV:=DEB_LDFLAGS_MAINT_STRIP="-Wl,-Bsymbolic-functions"
 LDFLAGS:=$(shell $(BUILDFLAGS_ENV) dpkg-buildflags --get LDFLAGS)
 
 F77:=gfortran
-FFLAGS:=$(shell dpkg-buildflags --get FFLAGS) -fno-whole-file
+FFLAGS:=$(shell dpkg-buildflags --get FFLAGS)
 
 CC:=cc
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
@@ -181,7 +181,7 @@ BIN:=$(addsuffix cblat1,$(BIN)) $(addsuffix cblat2,$(BIN)) $(addsuffix cblat3,$(
 BIN:=$(addprefix cblas/testing/x,$(BIN))
 
 $(BIN): libblas.so
-	cd cblas && $(MAKE) alltst CBLIB=
+	cd cblas && $(MAKE) alltst CBLIB= FFLAGS="$(FFLAGS) $(FFLAGS_EXTRA)"
 
 FBN:=s d c z
 FBN:=$(addsuffix blat1,$(FBN)) $(addsuffix blat2,$(FBN)) $(addsuffix blat3,$(FBN))
@@ -191,7 +191,7 @@ test/%.f: test/%
 	cp $< $@
 
 test/x%: test/%.f libblas.so 
-	$(F77) $(FFLAGS) $(LDFLAGS) -o $@ $< -L $$(pwd) -lblas
+	$(F77) $(FFLAGS) $(FFLAGS_EXTRA) $(LDFLAGS) -o $@ $< -L $$(pwd) -lblas
 
 OUT:=$(subst cblas/testing/,debian/test/,$(BIN))
 OUT1:=$(filter %1,$(OUT))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/blas.git