Bug#751478: NMU debdiff for flann_1.8.4-3.1

[Aníbal Monsalve Salazar]

Hello Mathieu,

At Imagination Technologies (http://imgtec.com/) Dejan Latinovic has
found a solution to Debian bug #751478.

https://bugs.debian.org/751478

My NMU debdiff for flann_1.8.4-3.1 is below, at the end of this message.

With the changes in the NMU debdiff, flann builds successfully on mips,
mipsel and amd64.

Regards,

Aníbal
--
Aníbal Monsalve Salazar <Anibal.MonsalveSalazar at imgtec.com>


debdiff flann_1.8.4-3.dsc flann_1.8.4-3.1.dsc
diff -Nru flann-1.8.4/debian/changelog flann-1.8.4/debian/changelog
--- flann-1.8.4/debian/changelog	2013-12-08 07:15:32.000000000 +0000
+++ flann-1.8.4/debian/changelog	2014-06-17 08:43:46.000000000 +0100
@@ -1,3 +1,12 @@
+flann (1.8.4-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use the ggc-min-expand flag.
+    Patch by Dejan Latinovic <Dejan.Latinovic at imgtec.com>.
+    Closes: #751478.
+
+ -- Anibal Monsalve Salazar <anibal at debian.org>  Tue, 17 Jun 2014 08:42:03 +0100
+
 flann (1.8.4-3) unstable; urgency=low
 
   * Do not use CMAKE_BUILD_TYPE. Closes: #731514
diff -Nru flann-1.8.4/debian/rules flann-1.8.4/debian/rules
--- flann-1.8.4/debian/rules	2013-12-08 07:15:49.000000000 +0000
+++ flann-1.8.4/debian/rules	2014-06-13 09:38:18.000000000 +0100
@@ -5,6 +5,12 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))
+	export DEB_CXXFLAGS_MAINT_APPEND = --param ggc-min-expand=20
+endif
+
 CMAKE_FLAGS = \
 	-DCMAKE_BUILD_TYPE:STRING=None \
 	-DBUILD_MATLAB_BINDINGS:BOOL=OFF \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers/attachments/20140617/88ada546/attachment-0001.sig>