From 56f9033e9a154c5414553d7adee37c1c5cb8dce4 Mon Sep 17 00:00:00 2001
From: jpan <jpan@253336fb-580f-4252-a368-f3cef5a2a82b>
Date: Tue, 30 Aug 2011 19:21:58 +0000
Subject: [PATCH] modified diff

git-svn-id: https://kforge.ros.org/fcl/fcl_ros@17 253336fb-580f-4252-a368-f3cef5a2a82b
---
 trunk/ann/Makefile  |  2 +-
 trunk/ann/fANN.diff | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 trunk/ann/fANN.diff

diff --git a/trunk/ann/Makefile b/trunk/ann/Makefile
index c7a85f38..17a131ef 100644
--- a/trunk/ann/Makefile
+++ b/trunk/ann/Makefile
@@ -5,7 +5,7 @@ all: installed
 #
 TARBALL = build/ann_1.1.2.tar.gz
 TARBALL_URL = http://www.cs.umd.edu/~mount/ANN/Files/1.1.2/ann_1.1.2.tar.gz
-TARBALL_PATCH = fPIC.diff
+TARBALL_PATCH = fANN.diff
 INITIAL_DIR = build/ann_1.1.2
 SOURCE_DIR = build/ann-tar
 include $(shell rospack find mk)/download_unpack_build.mk
diff --git a/trunk/ann/fANN.diff b/trunk/ann/fANN.diff
new file mode 100644
index 00000000..6c7650f3
--- /dev/null
+++ b/trunk/ann/fANN.diff
@@ -0,0 +1,24 @@
+diff -purN ann_1.1.2/include/ANN/ANN.h ann_1.1.2_modified/include/ANN/ANN.h
+--- include/ANN/ANN.h	2010-01-27 20:40:01.000000000 -0800
++++ include/ANN/ANN.h	2011-08-30 12:13:26.629632052 -0700
+@@ -232,7 +232,7 @@ const ANNdist	ANN_DIST_INF = ANN_DBL_MAX
+ //	strictly positive.
+ //----------------------------------------------------------------------
+ 
+-const ANNbool	ANN_ALLOW_SELF_MATCH	= ANNtrue;
++const ANNbool	ANN_ALLOW_SELF_MATCH	= ANNfalse;
+ 
+ //----------------------------------------------------------------------
+ //	Norms and metrics:
+diff -purN ann_1.1.2/Make-config ann_1.1.2_modified/Make-config
+--- Make-config	2010-01-27 20:40:01.000000000 -0800
++++ Make-config	2011-08-30 12:12:42.916876291 -0700
+@@ -72,7 +72,7 @@ linux-g++:
+ 	$(MAKE) targets \
+ 	"ANNLIB = libANN.a" \
+ 	"C++ = g++" \
+-	"CFLAGS = -O3" \
++	"CFLAGS = -O3 -fPIC" \
+ 	"MAKELIB = ar ruv" \
+ 	"RANLIB = true"
+ 
-- 
GitLab