summaryrefslogtreecommitdiffstats
path: root/src/flann-1-fix-pkgconfig.patch
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-08-11 03:04:34 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-08-11 17:36:54 (GMT)
commit9ed7f41489e61f00850dec9c27e5419920f65499 (patch)
treee26eae02ad61c17fcc74a8c89781ec18ce9dd49a /src/flann-1-fix-pkgconfig.patch
parent5880aee5cf50a10d0529f6e3c35725e92d4df537 (diff)
downloadmxe-9ed7f41489e61f00850dec9c27e5419920f65499.zip
mxe-9ed7f41489e61f00850dec9c27e5419920f65499.tar.gz
mxe-9ed7f41489e61f00850dec9c27e5419920f65499.tar.bz2
flann: enable shared lib
With this commit the static libs are installed as "libflann.a" instead of "libflann_s.a". pkg-config files are changed accordingly. Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src/flann-1-fix-pkgconfig.patch')
-rw-r--r--src/flann-1-fix-pkgconfig.patch16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/flann-1-fix-pkgconfig.patch b/src/flann-1-fix-pkgconfig.patch
deleted file mode 100644
index b180d0d..0000000
--- a/src/flann-1-fix-pkgconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Fix flann.pc to link with the static libraries.
-diff -uNr flann-1.7.1-src/cmake/flann.pc.in flann-1.7.1-src.patched/cmake/flann.pc.in
---- flann-1.7.1-src/cmake/flann.pc.in 2011-12-23 12:16:09.000000000 +0100
-+++ flann-1.7.1-src.patched/cmake/flann.pc.in 2012-10-01 12:46:31.617169719 +0200
-@@ -8,6 +8,6 @@
- Description: @PKG_DESC@
- Version: @FLANN_VERSION@
- Requires: @PKG_EXTERNAL_DEPS@
--Libs: -L${libdir} -lflann_cpp -lflann_cpp-gd
-+Libs: -L${libdir} -lflann_cpp_s -lflann_cpp_s-gd
- Cflags: -I${includedir}
-
-