[med-svn] r15301 - trunk/packages/vxl/trunk/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2013-11-28 12:44:39 +0000 (Thu, 28 Nov 2013)
New Revision: 15301

Added:
   trunk/packages/vxl/trunk/debian/patches/shared-lib-without-dependency-information.patch
Modified:
   trunk/packages/vxl/trunk/debian/patches/series
Log:
remove lintian warning

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2013-11-28 12:24:52 UTC (rev 15300)
+++ trunk/packages/vxl/trunk/debian/patches/series	2013-11-28 12:44:39 UTC (rev 15301)
@@ -15,3 +15,4 @@
 remove_contrib_testing.patch
 ocl.soname.patch
 opencl_kfreebsd.patch
+shared-lib-without-dependency-information.patch

Added: trunk/packages/vxl/trunk/debian/patches/shared-lib-without-dependency-information.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/shared-lib-without-dependency-information.patch	                        (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/shared-lib-without-dependency-information.patch	2013-11-28 12:44:39 UTC (rev 15301)
@@ -0,0 +1,70 @@
+Description: lintian is running ldd on three libs:
+ usr/lib/x86_64-linux-gnu/libvil3d_io.so.1.17.0
+ usr/lib/x86_64-linux-gnu/libvimt_algo.so.1.17.0
+ usr/lib/x86_64-linux-gnu/libvipl.so.1.17.
+ ldd thinks those are statically linked...
+ let's add some dummy symbols in the shared libs to avoid this lintian warning
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
+--- vxl-1.17.0.orig/contrib/mul/vil3d/io/vil3d_io_dummy.cxx
++++ vxl-1.17.0/contrib/mul/vil3d/io/vil3d_io_dummy.cxx
+@@ -5,7 +5,5 @@
+ // This file merely creates some code so that MSVC and other compilers will actually produce a library.
+ 
+ 
+-#ifdef _MSC_VER
+ char * vil3d_io_dummy = "dummy";
+-#endif
+ 
+--- vxl-1.17.0.orig/contrib/mul/vimt/algo/vimt_dummy.cxx
++++ vxl-1.17.0/contrib/mul/vimt/algo/vimt_dummy.cxx
+@@ -4,6 +4,4 @@
+ // \author Ian Scott
+ // This file merely creates some code so that MSVC and other compilers will actually produce a library.
+ 
+-#ifdef _MSC_VER
+ char * vimt_algo_dummy = "dummy";
+-#endif
+--- vxl-1.17.0.orig/contrib/tbl/vipl/CMakeLists.txt
++++ vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt
+@@ -68,13 +68,13 @@ ADD_DEFINITIONS(-DINSTANTIATE_TEMPLATES)
+ # AUX_SOURCE_DIRECTORY(vipl_with_vnl_matrix/Templates vipl_sources)
+ # AUX_SOURCE_DIRECTORY(vipl_with_section/Templates vipl_sources)
+ 
+-IF(CMAKE_COMPILER_IS_GNUCXX)
+- SET_SOURCE_FILES_PROPERTIES(
+-  vipl_with_section/Templates/vipl_filter_2d+section+vil1_rgb+uchar-.2-.section+vil1_rgb+uchar-.2-.vil1_rgb+uchar-.vil1_rgb+uchar--.cxx
+-   PROPERTIES
+-   COMPILE_FLAGS -O1
+- )
+-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
++#IF(CMAKE_COMPILER_IS_GNUCXX)
++# SET_SOURCE_FILES_PROPERTIES(
++#  vipl_with_section/Templates/vipl_filter_2d+section+vil1_rgb+uchar-.2-.section+vil1_rgb+uchar-.2-.vil1_rgb+uchar-.vil1_rgb+uchar--.cxx
++#   PROPERTIES
++#   COMPILE_FLAGS -O1
++# )
++#ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+ ADD_LIBRARY(vipl ${vipl_sources})
+ SET_TARGET_PROPERTIES(vipl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+--- vxl-1.17.0.orig/contrib/tbl/vipl/filter/vipl_filter_abs.cxx
++++ vxl-1.17.0/contrib/tbl/vipl/filter/vipl_filter_abs.cxx
+@@ -4,4 +4,5 @@
+ #endif
+ #include "vipl_filter_abs.h"
+ // the following is just for avoiding an empty library:
+-char dummy = 'p';
++char *dummy = "dummy";
++void vipl_filter_abs::foo() {}
+--- vxl-1.17.0.orig/contrib/tbl/vipl/filter/vipl_filter_abs.h
++++ vxl-1.17.0/contrib/tbl/vipl/filter/vipl_filter_abs.h
+@@ -29,6 +29,7 @@
+ 
+ class vipl_filter_abs
+ {
++ void foo();
+  public:
+ 
+ #ifdef USE_COMPOSE_WITH