[lapack] 09/17: decouple_gcc.diff: remove patch.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository lapack.

commit b2ff714bdee6d917765c84762962352dd166814b
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Dec 23 00:02:05 2015 +0100

    decouple_gcc.diff: remove patch.
    
    Add equivalent functionality in the make.inc rule of debian/rules.
    
    Gbp-Dch: Full
---
 debian/patches/decouple_gcc.diff | 11 -----------
 debian/patches/series            |  1 -
 debian/rules                     |  3 ++-
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/debian/patches/decouple_gcc.diff b/debian/patches/decouple_gcc.diff
deleted file mode 100644
index d53fa9e..0000000
--- a/debian/patches/decouple_gcc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/INSTALL/make.inc.gfortran
-+++ b/INSTALL/make.inc.gfortran
-@@ -46,7 +46,7 @@ TIMER    = INT_ETIME
- #
- # CC is the C compiler, normally invoked with options CFLAGS.
- #
--CC = gcc
-+CC = /usr/bin/cc
- CFLAGS = -O3
- #
- # LAPACKE has also the interface to some routines from tmglib,
diff --git a/debian/patches/series b/debian/patches/series
index df8999b..442767b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 lapack_testing.patch
 no_blas_manpages.patch
-decouple_gcc.diff
 parallel_build.patch
 doxygen-exclude-binary-objects.patch
diff --git a/debian/rules b/debian/rules
index 4f59f2d..20eba64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,8 @@ endif
 	dh $@ --parallel
 
 make.inc: INSTALL/make.inc.gfortran
-	sed -e "s,\(^NOOPT  *=\).*,\1 \$$(PICOPTS) $(FFLAGS_NOOPT),1" \
+	sed -e "s,\(^CC  *=\).*,\1 /usr/bin/cc,1" \
+	    -e "s,\(^NOOPT  *=\).*,\1 \$$(PICOPTS) $(FFLAGS_NOOPT),1" \
 	    -e "s,\(^OPTS  *=\).*,\1 \$$(PICOPTS) $(FFLAGS),1" \
 	    -e "s/\(^LOADOPTS  *=\).*/\1 $(LDFLAGS)/1" \
 	    -e "s,\(^CFLAGS  *=\).*,\1 $(CPPFLAGS) \$$(PICOPTS) $(CFLAGS),1" \

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