From 9ed5bc286be939493e3cb5e58643482f7aade5e2 Mon Sep 17 00:00:00 2001
From: suvari <suvarice@gmail.com>
Date: Sun, 30 Apr 2017 21:35:49 +0300
Subject: [PATCH] flann: patched for gcc6, rebuild

---
 main_35_list.txt                              |  2 --
 .../misc/flann/files/flann-1.8.4-gcc6.patch   | 20 +++++++++++++++++++
 programming/misc/flann/pspec.xml              |  3 +++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 programming/misc/flann/files/flann-1.8.4-gcc6.patch

diff --git a/main_35_list.txt b/main_35_list.txt
index ca9ec38140..e072f8a515 100644
--- a/main_35_list.txt
+++ b/main_35_list.txt
@@ -33,8 +33,6 @@
 2016-06-10 /programming/language/java/eclipse-ecj/pspec.xml
 2016-06-09 /programming/language/java/fastjar/pspec.xml
 2016-06-09 /programming/language/java/rhino/pspec.xml
-2014-03-09 /programming/misc/libunique/pspec.xml
-2016-06-09 /programming/misc/flann/pspec.xml
 2016-06-09 /programming/misc/libctemplate/pspec.xml
 2016-06-09 /programming/misc/libqjson/pspec.xml
 2016-06-09 /programming/misc/intel-tbb/pspec.xml
diff --git a/programming/misc/flann/files/flann-1.8.4-gcc6.patch b/programming/misc/flann/files/flann-1.8.4-gcc6.patch
new file mode 100644
index 0000000000..94b56693d5
--- /dev/null
+++ b/programming/misc/flann/files/flann-1.8.4-gcc6.patch
@@ -0,0 +1,20 @@
+diff -up ./src/cpp/flann/algorithms/kdtree_index.h.gcc6 ./src/cpp/flann/algorithms/kdtree_index.h
+--- ./src/cpp/flann/algorithms/kdtree_index.h.gcc6	2013-01-15 22:38:32.000000000 -0500
++++ ./src/cpp/flann/algorithms/kdtree_index.h	2016-02-14 11:26:59.339178023 -0500
+@@ -34,6 +34,7 @@
+ #include <algorithm>
+ #include <map>
+ #include <cassert>
++#include <cmath>
+ #include <cstring>
+ #include <stdarg.h>
+ 
+@@ -663,7 +664,7 @@ private:
+             ElementType max_span = 0;
+             size_t div_feat = 0;
+             for (size_t i=0;i<veclen_;++i) {
+-                ElementType span = abs(point[i]-leaf_point[i]);
++                ElementType span = std::fabs(point[i]-leaf_point[i]);
+                 if (span > max_span) {
+                     max_span = span;
+                     div_feat = i;
diff --git a/programming/misc/flann/pspec.xml b/programming/misc/flann/pspec.xml
index 5569bcf87b..c1fc1a6ba7 100644
--- a/programming/misc/flann/pspec.xml
+++ b/programming/misc/flann/pspec.xml
@@ -16,6 +16,9 @@
         <BuildDependencies>
             <Dependency>cmake</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch>flann-1.8.4-gcc6.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>