[blas] 02/03: Restore -fno-whole-file and -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 2e0a125b18c6806056041f3c7dab25559d82bb6a
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Sep 24 20:39:18 2013 +0200

    Restore -fno-whole-file and -ffloat-store
    
    (the latter only for *-i386 and m68k, and only for some files), otherwise some tests break
---
 debian/changelog |    2 ++
 debian/rules     |   12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe2b945..473694d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 blas (1.2.20110419-7) UNRELEASED; urgency=low
 
   * Make sure that -mieee is used when compiling on alpha
+  * Restore -fno-whole-file and -ffloat-store (the latter only for *-i386
+    and m68k, and only for some files), otherwise some tests break
 
  -- Sébastien Villemot <sebastien at debian.org>  Mon, 23 Sep 2013 20:54:14 +0000
 
diff --git a/debian/rules b/debian/rules
index ac1edf6..10a0861 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,18 +6,24 @@ 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)
+FFLAGS:=$(shell dpkg-buildflags --get FFLAGS) -fno-whole-file
 
 CC:=cc
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 
 ARCH:=$(shell dpkg --print-architecture)
+CPU:=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 ifeq ($(ARCH),alpha)
   FFLAGS += -mieee
 endif
 
+# Necessary to avoid test failures
+ifneq (,$(filter $(CPU),i386 m68k))
+  FFLAGS_EXTRA := -ffloat-store
+endif
+
 
 SO=3
 VERS=$(SO).0
@@ -125,12 +131,12 @@ $(subst src/,debian/shared/,$(BOBJ1)): \
 $(subst src/,debian/static/,$(BOBJ2)): \
 	debian/static/%.o : src/%.f debian/static_dir
 
-	$(F77) $(FFLAGS) -c $< -o $@	
+	$(F77) $(FFLAGS) $(FFLAGS_EXTRA) -c $< -o $@	
 
 $(subst src/,debian/shared/,$(BOBJ2)): \
 	debian/shared/%.o : src/%.f debian/shared_dir
 
-	$(F77) $(FFLAGS) -fPIC -c $< -o $@	
+	$(F77) $(FFLAGS) $(FFLAGS_EXTRA) -fPIC -c $< -o $@	
 
 libblas.a: cblas/libcblas.a $(subst src/,debian/static/,$(BOBJ)) debian/static_dir
 	cd debian/static && ar x ../../$<

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