[Pkg-octave-commit] [octave-linear-algebra] 01/02: mkoctfile-depends.patch: new patch, drops the call to mkoctfile -M.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave-linear-algebra.

commit 6b1c6bb4ea276f1e05c59549f80cc810946ed190
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Sep 24 09:41:55 2014 +0200

    mkoctfile-depends.patch: new patch, drops the call to mkoctfile -M.
    
    Should fix FTBFS on armel, armhf, powerpc, ppc64el, s390x.
    
    Git-Dch: Full
---
 debian/patches/mkoctfile-depends.patch | 57 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 58 insertions(+)

diff --git a/debian/patches/mkoctfile-depends.patch b/debian/patches/mkoctfile-depends.patch
new file mode 100644
index 0000000..62aec06
--- /dev/null
+++ b/debian/patches/mkoctfile-depends.patch
@@ -0,0 +1,57 @@
+Description: Drop generation of dependency files (*.d)
+ This is unneeded in our case, because we don't care about proper in-tree recompilation.
+ And for some unexplained reason, mkoctfile -M enters an infinite loop on several archs,
+ leading to a FTBFS (armel, armhf, powerpc, ppc64el, s390x)
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2014-09-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -10,34 +10,24 @@ DEFINES = -DHAVE_CONFIG_H -Wall
+ GSVD_OBJECTS = gsvd.o dbleGSVD.o CmplxGSVD.o 
+ GSVD_TARGET = gsvd.oct
+ GSVD_TEST = gsvd
+-GSVD_DEPENDS = gsvd.d dbleGSVD.d CmplxGSVD.d
+ 
+ OBJECTS = $(GSVD_OBJECTS) 
+ TARGETS = $(GSVD_TARGET) 
+-DEPENDS = $(GSVD_DEPENDS) 
+ 
+ .PHONY: all test clean count
+ 
+ .SUFFIXES:
+ 
+-.PRECIOUS: %.d %.o
++.PRECIOUS: %.o
+ 
+ all : $(TARGETS) pgmres.oct
+ 
+-$(GSVD_TARGET) : $(GSVD_DEPENDS) $(GSVD_OBJECTS)
++$(GSVD_TARGET) : $(GSVD_OBJECTS)
+ 	$(MKOCTFILE) $(DEFINES) $(GSVD_OBJECTS) -o $@ ${LAPACK_LIBS}
+ 
+ $(GSVD_TEST) : $(GSVD_TARGET)
+ 
+-ifneq (,$(DEPENDS))
+-  sinclude $(DEPENDS)
+-endif
+-
+-%.d:%.cc
+-	$(MKOCTFILE) $(DEFINES) -M $<
+-
+ %.o:%.cc
+-%.o:%.cc %.d
+ 	$(MKOCTFILE) $(DEFINES) -c $<
+ 
+ %.o:%.f
+@@ -53,7 +43,7 @@ test: $(GSVD_TEST)
+ 	for i in $^; do echo "test $$i"; done | octave --silent
+ 
+ clean: 
+-	rm -f $(TARGETS) $(DEPENDS) $(OBJECTS) octave-core
++	rm -f $(TARGETS) $(OBJECTS) octave-core
+ 
+ count:
+ 	wc *{.cc,.h,.f}
diff --git a/debian/patches/series b/debian/patches/series
index 2301b3d..120cbcb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
  
 fix-tests.patch
 autoload-yes.patch
+mkoctfile-depends.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-linear-algebra.git