[Pkg-octave-commit] [octave-image] 01/02: bwdist-noopt.patch: new patch, disables optimization when compiling bwdist.

[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-image.

commit 4f1665bd6927fa16c5ac91e199f15673e2c70445
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Feb 22 15:15:25 2014 +0100

    bwdist-noopt.patch: new patch, disables optimization when compiling bwdist.
    
    Fixes FTBFS on i386.
    
    Git-Dch: Full
---
 debian/patches/bwdist-noopt.patch | 19 +++++++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/bwdist-noopt.patch b/debian/patches/bwdist-noopt.patch
new file mode 100644
index 0000000..08dc3bd
--- /dev/null
+++ b/debian/patches/bwdist-noopt.patch
@@ -0,0 +1,19 @@
+Description: Disable optimization when compiling bwdist
+ As of g++-4.8 4.8.2-16, if bwdist is compiled with optimization, then its
+ testsuite enters an infinite loop on i386.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-02-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,5 +13,8 @@ bwlabeln.oct: bwlabeln.cc union-find.h++
+ imerode.oct: imerode.cc strel.cc
+ 	$(MKOCTFILE) $^ -o $@
+ 
++bwdist.oct: bwdist.cc
++	CXXFLAGS="$(shell env DEB_BUILD_OPTIONS=noopt dpkg-buildflags --get CXXFLAGS)" $(MKOCTFILE) $<
++
+ clean:
+ 	rm -f *.o octave-core core *.oct *~
diff --git a/debian/patches/series b/debian/patches/series
index d0dd8d3..149d584 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 autoload-yes.patch
 use-dpkg-buildflags.patch
+bwdist-noopt.patch

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