[visp] 01/02: Add patch to avoid linking against libgslcblas.so if possible.

[Thomas Moulard]

This is an automated email from the git hooks/post-receive script.

thomas_moulard-guest pushed a commit to branch master
in repository visp.

commit 87e1d01faea4f06b2d9e2eaecd68cca502061789
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Fri Jul 11 03:49:45 2014 +0900

    Add patch to avoid linking against libgslcblas.so if possible.
---
 ...-config-files-in-arch-specific-directory.patch} |  0
 ...ommented-lines-in-visp-config.install.in.patch} |  0
 ...ng-against-useless-dependency-in-FindGSL..patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  5 ++--
 4 files changed, 36 insertions(+), 2 deletions(-)

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 0000000..3a6d39a
--- /dev/null
+++ b/debian/patches/0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch
@@ -0,0 +1,33 @@
+From: Fabien Spindler <fabien.spindler at 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 3afa626..5383c13 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visp.git