[Pkg-octave-commit] [octave-linear-algebra] 01/01: mkoctfile-depends.patch: remove patch.
Sébastien Villemot
sebastien at debian.org
Mon Dec 1 20:50:25 UTC 2014
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 154555a04e89fb3419dce35fc870cf16d2ad5811
Author: Sébastien Villemot <sebastien at debian.org>
Date: Mon Dec 1 21:50:18 2014 +0100
mkoctfile-depends.patch: remove patch.
It is no longer needed since #770192 is now fixed.
Git-Dch: Full
---
debian/patches/mkoctfile-depends.patch | 57 ----------------------------------
debian/patches/series | 1 -
2 files changed, 58 deletions(-)
diff --git a/debian/patches/mkoctfile-depends.patch b/debian/patches/mkoctfile-depends.patch
deleted file mode 100644
index 62aec06..0000000
--- a/debian/patches/mkoctfile-depends.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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 120cbcb..2301b3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
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
More information about the Pkg-octave-commit
mailing list