From 87e1d01faea4f06b2d9e2eaecd68cca502061789 Mon Sep 17 00:00:00 2001
From: Thomas Moulard <thomas.moulard@gmail.com>
Date: Fri, 11 Jul 2014 03:49:45 +0900
Subject: [PATCH] Add patch to avoid linking against libgslcblas.so if
possible.
---
...ig-files-in-arch-specific-directory.patch} | 0
...ted-lines-in-visp-config.install.in.patch} | 0
...ainst-useless-dependency-in-FindGSL..patch | 33 +++++++++++++++++++
debian/patches/series | 5 +--
4 files changed, 36 insertions(+), 2 deletions(-)
rename debian/patches/{0003-Subject-Install-OGRE-config-files-in-arch-specific-d.patch => 0003-Install-OGRE-config-files-in-arch-specific-directory.patch} (100%)
rename debian/patches/{0004-Subject-Remove-commented-lines-in-visp-config.instal.patch => 0004-Remove-commented-lines-in-visp-config.install.in.patch} (100%)
create mode 100644 debian/patches/0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch
diff --git a/debian/patches/0003-Subject-Install-OGRE-config-files-in-arch-specific-d.patch b/debian/patches/0003-Install-OGRE-config-files-in-arch-specific-directory.patch
similarity index 100%
rename from debian/patches/0003-Subject-Install-OGRE-config-files-in-arch-specific-d.patch
rename to debian/patches/0003-Install-OGRE-config-files-in-arch-specific-directory.patch
diff --git a/debian/patches/0004-Subject-Remove-commented-lines-in-visp-config.instal.patch b/debian/patches/0004-Remove-commented-lines-in-visp-config.install.in.patch
similarity index 100%
rename from debian/patches/0004-Subject-Remove-commented-lines-in-visp-config.instal.patch
rename to debian/patches/0004-Remove-commented-lines-in-visp-config.install.in.patch
diff --git a/debian/patches/0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch b/debian/patches/0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch
new file mode 100644
index 00000000..3a6d39aa
--- /dev/null
+++ b/debian/patches/0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch
@@ -0,0 +1,33 @@
+From: Fabien Spindler <fabien.spindler@inria.fr>
+Date: Fri, 11 Jul 2014 03:47:21 +0900
+Subject: Avoid linking against useless dependency in FindGSL.cmake if
+ possible.
+
+* CMakeModules/FindGSL.cmake: do not link against libgslcblas.so if
+ not needed.
+
+Origin: upstream, private email
+---
+ CMakeModules/FindGSL.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeModules/FindGSL.cmake b/CMakeModules/FindGSL.cmake
+index adecf19..62f89fe 100644
+--- a/CMakeModules/FindGSL.cmake
++++ b/CMakeModules/FindGSL.cmake
+@@ -173,6 +173,7 @@ ELSE(WIN32)
+ FOREACH(libs ${GSL_LINK_LIBRARIES})
+ STRING(REGEX REPLACE "[-][l]" "" GSL_LIB_ONES ${libs})
+ #MESSAGE("GSL_LIB_ONES=${GSL_LIB_ONES} - ${libs}")
++ if(NOT ${GSL_LIB_ONES} MATCHES "gslcblas")
+ MARK_AS_ADVANCED(LIBGSL_${GSL_LIB_ONES})
+ FIND_LIBRARY(LIBGSL_${GSL_LIB_ONES}
+ NAMES ${GSL_LIB_ONES}
+@@ -186,6 +187,7 @@ ELSE(WIN32)
+ #MESSAGE("LIB_GSL=${LIB_GSL} - ${libs}")
+ LIST(APPEND GSL_LIBRARIES ${LIBGSL_${GSL_LIB_ONES}})
+ ENDIF()
++ endif()
+ ENDFOREACH(libs)
+
+ #MESSAGE("GSL_LIBRARIES=${GSL_LIBRARIES}")
diff --git a/debian/patches/series b/debian/patches/series
index 3afa6263..5383c131 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
0001-Install-vpConfig.h-in-include-architecture-triplet.patch
0002-Fix-compat-with-ffmpeg-libraries.patch
-0003-Subject-Install-OGRE-config-files-in-arch-specific-d.patch
-0004-Subject-Remove-commented-lines-in-visp-config.instal.patch
+0003-Install-OGRE-config-files-in-arch-specific-directory.patch
+0004-Remove-commented-lines-in-visp-config.install.in.patch
+0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch
--
GitLab