Author: malat Date: 2013-11-28 12:58:33 +0000 (Thu, 28 Nov 2013) New Revision: 15302
Added: trunk/packages/vxl/trunk/debian/patches/compflags.patch Modified: trunk/packages/vxl/trunk/debian/patches/series trunk/packages/vxl/trunk/debian/patches/shared-lib-without-dependency-information.patch trunk/packages/vxl/trunk/debian/rules Log: Prepare patch for comp flags Added: trunk/packages/vxl/trunk/debian/patches/compflags.patch =================================================================== --- trunk/packages/vxl/trunk/debian/patches/compflags.patch (rev 0) +++ trunk/packages/vxl/trunk/debian/patches/compflags.patch 2013-11-28 12:58:33 UTC (rev 15302) @@ -0,0 +1,552 @@ +Description: do not set optimization flags explicitely +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: no + +Index: vxl-1.17.0/core/vnl/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vnl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vnl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -241,19 +241,6 @@ + AUX_SOURCE_DIRECTORY(Templates vnl_sources) + + IF(CMAKE_COMPILER_IS_GNUCXX) +- # with optimisation, the is_finite etc functions fail on Alpha for long double: +- SET_SOURCE_FILES_PROPERTIES(vnl_math.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(vnl_bignum.cxx PROPERTIES COMPILE_FLAGS -O0) +- # and these need too much memory with gcc 3.0 on Alpha: +- SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix+long-.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix+ulong-.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix+vcl_complex+double--.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix+vcl_complex+long_double--.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix_fixed+vnl_bignum.3.3-.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(Templates/vnl_vector+vnl_rational-.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(Templates/vnl_vector_fixed+vnl_rational.3-.cxx PROPERTIES COMPILE_FLAGS -O0) +- # with optimisation, the vnl_na etc functions fail on x86_64: +- SET_SOURCE_FILES_PROPERTIES(vnl_na.cxx PROPERTIES COMPILE_FLAGS -O1) + # gcc must have -msse2 option to enable sse2 support + IF(VNL_CONFIG_ENABLE_SSE2) + ADD_DEFINITIONS( -msse2 ) +Index: vxl-1.17.0/core/vnl/io/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vnl/io/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vnl/io/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -19,12 +19,6 @@ + + AUX_SOURCE_DIRECTORY(Templates vnl_io_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(Templates/vsl_vector_io+vcl_vector+vcl_vector+vnl_vector+double----.cxx +- PROPERTIES +- COMPILE_FLAGS -ftemplate-depth-35) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(vnl_io ${vnl_io_sources} ) + SET_TARGET_PROPERTIES(vnl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + TARGET_LINK_LIBRARIES( vnl_io vnl vsl ) +Index: vxl-1.17.0/core/vnl/tests/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vnl/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vnl/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -49,12 +49,6 @@ + test_vnl_index_sort.cxx + ) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(test_rational.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(test_bignum.cxx PROPERTIES COMPILE_FLAGS -O3) +- SET_SOURCE_FILES_PROPERTIES(test_finite.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + TARGET_LINK_LIBRARIES(vnl_test_all vnl vpl vul testlib ${CMAKE_THREAD_LIBS}) + + ADD_EXECUTABLE(vnl_basic_operation_timings basic_operation_timings.cxx) +Index: vxl-1.17.0/core/vidl/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vidl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vidl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -152,9 +152,6 @@ + INCLUDE(CheckCXXCompilerFlag) + SET( TEMPLATE_DEPTH_FLAG -ftemplate-depth-1000 ) + CHECK_CXX_COMPILER_FLAG(${TEMPLATE_DEPTH_FLAG} HAS_TEMPLATE_DEPTH_FLAG) +-IF( HAS_TEMPLATE_DEPTH_FLAG ) +- SET_TARGET_PROPERTIES( vidl PROPERTIES COMPILE_FLAGS ${TEMPLATE_DEPTH_FLAG}) +-ENDIF( HAS_TEMPLATE_DEPTH_FLAG ) + + # vgui add on library + SUBDIRS( gui ) +Index: vxl-1.17.0/core/vpl/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vpl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vpl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -14,9 +14,6 @@ + + ADD_LIBRARY(vpl ${vpl_sources}) + SET_TARGET_PROPERTIES(vpl PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES}) +-IF(NOT WIN32) +- SET_TARGET_PROPERTIES(vpl PROPERTIES COMPILE_FLAGS "-fPIC") +-ENDIF(NOT WIN32) + + TARGET_LINK_LIBRARIES( vpl vcl ) + +Index: vxl-1.17.0/core/vgui/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vgui/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vgui/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -335,10 +335,6 @@ + + SET( vgui_sources ${vgui_sources} ${vgui_qt_sources} ${vgui_qt_moc_files} ) + +- IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/moc_vgui_qt_adaptor.cxx GENERATED PROPERTIES COMPILE_FLAGS -O0) +- ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ENDIF(VGUI_USE_QT) + + ENDIF (QT_FOUND) +Index: vxl-1.17.0/core/vsl/tests/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vsl/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vsl/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -21,10 +21,6 @@ + test_block_rle_io.cxx + ) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(test_map_io.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_TEST(vsl_test_indent ${EXECUTABLE_OUTPUT_PATH}/vsl_test_all test_indent) + ADD_TEST(vsl_test_binary_io ${EXECUTABLE_OUTPUT_PATH}/vsl_test_all test_binary_io) + +Index: vxl-1.17.0/core/vcsl/examples/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vcsl/examples/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vcsl/examples/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -4,7 +4,3 @@ + + ADD_EXECUTABLE(vcsl_example1 example1.cxx) + ADD_EXECUTABLE(vcsl_tutor vcsl_tutor.cxx) +- +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(example1.cxx PROPERTIES COMPILE_FLAGS -O1) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +Index: vxl-1.17.0/core/vgl/xio/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vgl/xio/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vgl/xio/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -11,9 +11,6 @@ + + ADD_LIBRARY(vgl_xio ${vgl_xio_sources}) + SET_TARGET_PROPERTIES(vgl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +-IF(NOT WIN32) +- SET_TARGET_PROPERTIES(vgl_xio PROPERTIES COMPILE_FLAGS "-fPIC") +-ENDIF(NOT WIN32) + TARGET_LINK_LIBRARIES( vgl_xio vgl vsl ) + + INSTALL_TARGETS(/lib vgl_xio) +Index: vxl-1.17.0/core/vil/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vil/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vil/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -281,11 +281,6 @@ + + AUX_SOURCE_DIRECTORY(Templates vil_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(vil_na.cxx PROPERTIES COMPILE_FLAGS -O1) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- +- + # Some versions of Solaris (at least 5.8) has a brain-dead mechanism + # for implementing DNS services, where the user of a library that uses + # gethostbyname should link to -lnsl *before* linking to the +Index: vxl-1.17.0/core/vil/io/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vil/io/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vil/io/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -8,12 +8,6 @@ + ) + AUX_SOURCE_DIRECTORY(Templates vil_io_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(Templates/vsl_vector_io+vcl_vector+vil_image_view+float---.cxx +- PROPERTIES +- COMPILE_FLAGS -ftemplate-depth-35) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(vil_io ${vil_io_sources}) + SET_TARGET_PROPERTIES(vil_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + TARGET_LINK_LIBRARIES( vil_io vil vsl ) +Index: vxl-1.17.0/core/vil/algo/tests/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vil/algo/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vil/algo/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -40,10 +40,6 @@ + test_algo_flood_fill.cxx + ) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(test_algo_convolve_1d.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + TARGET_LINK_LIBRARIES( vil_algo_test_all vil_algo testlib vcl ) + + +Index: vxl-1.17.0/core/vil1/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vil1/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vil1/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -164,10 +164,6 @@ + + AUX_SOURCE_DIRECTORY(Templates vil1_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(vil1_image_as.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(vil1 ${vil1_sources}) + SET_TARGET_PROPERTIES(vil1 PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib vil1) +Index: vxl-1.17.0/core/vul/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/core/vul/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/core/vul/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -48,10 +48,6 @@ + ) + + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(vul_sequence_filename_map.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + IF(APPLE) + ADD_LIBRARY(vul ${vul_sources}) + INSTALL_TARGETS(/lib vul) +Index: vxl-1.17.0/v3p/zlib/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/v3p/zlib/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/v3p/zlib/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -28,10 +28,6 @@ + ) + + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(deflate.c PROPERTIES COMPILE_FLAGS -O1) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY( z ${zlib_sources} ) + INSTALL_TARGETS( /lib z ) + +Index: vxl-1.17.0/v3p/Qv/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/v3p/Qv/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/v3p/Qv/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -164,10 +164,6 @@ + + AUX_SOURCE_DIRECTORY( Templates Qv_sources ) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(QvLib.cxx PROPERTIES COMPILE_FLAGS -O1) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY( Qv ${Qv_sources} ) + SET_TARGET_PROPERTIES(Qv PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + +Index: vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -16,10 +16,6 @@ + + AUX_SOURCE_DIRECTORY(Templates rsdl_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(Templates/rsdl_bins_2d+double.int-.cxx PROPERTIES COMPILE_FLAGS -O1) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(rsdl ${rsdl_sources}) + SET_TARGET_PROPERTIES(rsdl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib rsdl) +Index: vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/mul/mbl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -116,10 +116,6 @@ + + AUX_SOURCE_DIRECTORY(Templates mbl_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(Templates/mbl_data_wrapper_mixer+vnl_vector+double--.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(mbl ${mbl_sources}) + SET_TARGET_PROPERTIES(mbl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + TARGET_LINK_LIBRARIES(mbl vnl_io vnl_algo vgl_io vgl vbl_io vil_io vsl vnl vil vul vbl) +Index: vxl-1.17.0/contrib/mul/mil/tests/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/mul/mil/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/mul/mil/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -5,10 +5,6 @@ + ADD_EXECUTABLE(mil_test_all test_mil.cxx) + ADD_TEST(mil_test_all ${EXECUTABLE_OUTPUT_PATH}/mil_test_all) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(test_mil.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_EXECUTABLE(mil_test_include test_include.cxx) + TARGET_LINK_LIBRARIES(mil_test_include mil_algo) + ADD_EXECUTABLE(mil_test_template_include test_template_include.cxx) +Index: vxl-1.17.0/contrib/brl/bseg/brec_batch/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/brl/bseg/brec_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/brl/bseg/brec_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -24,9 +24,6 @@ + SET_TARGET_PROPERTIES(brec_batch PROPERTIES OUTPUT_NAME brec_batch DEBUG_POSTFIX _d SUFFIX .pyd) + ENDIF(WIN32) + SET_TARGET_PROPERTIES(brec_batch PROPERTIES PREFIX "") +- IF(NOT WIN32) +- SET_TARGET_PROPERTIES(bbgm_batch PROPERTIES COMPILE_FLAGS "-fPIC") +- ENDIF(NOT WIN32) + + TARGET_LINK_LIBRARIES(brec_batch bprb brdb bpro_batch bmdl_pro bvxm_pro bvxm_io bvxm_grid_io brec_pro bbgm_pro bvgl_pro brip_pro bsvg_pro vbl vpgl_io vidl_pro vpgl_pro vil_io vil_pro) + +Index: vxl-1.17.0/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -64,7 +64,6 @@ + + IF( CMAKE_USE_PTHREADS_INIT ) + ADD_DEFINITIONS(-DBVPL_OCTREE_HAS_PTHREADS=1) +- SET_TARGET_PROPERTIES(bvpl_octree PROPERTIES COMPILE_FLAGS -pthread) + TARGET_LINK_LIBRARIES(bvpl_octree pthread) + ENDIF( CMAKE_USE_PTHREADS_INIT ) + +Index: vxl-1.17.0/contrib/brl/bseg/bvpl_batch/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/brl/bseg/bvpl_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/brl/bseg/bvpl_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -26,9 +26,6 @@ + SET_TARGET_PROPERTIES(bvpl_batch PROPERTIES OUTPUT_NAME bvpl_batch DEBUG_POSTFIX _d SUFFIX .pyd) + ENDIF(WIN32) + SET_TARGET_PROPERTIES(bvpl_batch PROPERTIES PREFIX "") +- IF(NOT WIN32) +- SET_TARGET_PROPERTIES(bvpl_batch PROPERTIES COMPILE_FLAGS "-fPIC") +- ENDIF(NOT WIN32) + + TARGET_LINK_LIBRARIES(bvpl_batch bprb brdb bpro_batch vbl bvpl bvpl_pro bvpl_kernels_pro bvxm_grid_pro bvxm_grid_io bvxm_algo_pro) + +Index: vxl-1.17.0/contrib/brl/bseg/bbgm_batch/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/brl/bseg/bbgm_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/brl/bseg/bbgm_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -38,9 +38,6 @@ + ENDIF(WIN32) + + SET_TARGET_PROPERTIES(bbgm_batch PROPERTIES PREFIX "") +- IF(NOT WIN32) +- SET_TARGET_PROPERTIES(bbgm_batch PROPERTIES COMPILE_FLAGS "-fPIC") +- ENDIF(NOT WIN32) + TARGET_LINK_LIBRARIES(bbgm_batch + bprb brdb bpro_batch bbgm_pro + vidl_pro vil_pro +Index: vxl-1.17.0/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -25,9 +25,6 @@ + SET_TARGET_PROPERTIES(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch SUFFIX .so) + ENDIF(APPLE) + SET_TARGET_PROPERTIES(bvpl_octree_batch PROPERTIES PREFIX "") +- IF(NOT WIN32) +- SET_TARGET_PROPERTIES(bvpl_octree_batch PROPERTIES COMPILE_FLAGS "-fPIC") +- ENDIF(NOT WIN32) + + TARGET_LINK_LIBRARIES(bvpl_octree_batch bvpl_octree_pro bvpl_kernels_pro bpro_batch boxm_pro boxm_algo_pro vpgl_io vpgl_pro vil_io vil_pro) + +Index: vxl-1.17.0/contrib/brl/bseg/bvxm_batch/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/brl/bseg/bvxm_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/brl/bseg/bvxm_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -28,9 +28,6 @@ + ENDIF (NOT CYGWIN) + ENDIF(WIN32) + SET_TARGET_PROPERTIES(bvxm_batch PROPERTIES PREFIX "") +- IF(NOT WIN32) +- SET_TARGET_PROPERTIES(bvxm_batch PROPERTIES COMPILE_FLAGS "-fPIC") +- ENDIF(NOT WIN32) + TARGET_LINK_LIBRARIES(bvxm_batch bprb brdb bpro_batch vbl bvxm bvxm_pro bvxm_io bvxm_grid_io bvxm_grid_pro vpgl_io vpgl_pro vil_io vil_pro sdet_pro) + + IF (PYTHON_DEBUG_LIBRARIES) +Index: vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/tbl/vipl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -68,14 +68,6 @@ + # 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) +- + ADD_LIBRARY(vipl ${vipl_sources}) + SET_TARGET_PROPERTIES(vipl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib vipl) +Index: vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/tbl/vepl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -36,21 +36,6 @@ + # [only when INSTANTIATE_TEMPLATES not defined:] + # AUX_SOURCE_DIRECTORY(Templates vepl_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(vepl_gaussian_convolution.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(vepl_threshold.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl_add_random_noise.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl_dyadic.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(vepl_dilate_disk.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl_erode_disk.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl_median.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl_moment.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl_histogram.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(Templates/vepl_convert+uchar-.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(Templates/vepl_convert+short-.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(Templates/vepl_convert+float-.cxx PROPERTIES COMPILE_FLAGS -O1) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(vepl ${vepl_sources}) + SET_TARGET_PROPERTIES(vepl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib vepl) +Index: vxl-1.17.0/contrib/tbl/vepl/examples/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/tbl/vepl/examples/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/tbl/vepl/examples/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -23,8 +23,3 @@ + ADD_EXECUTABLE(vepl_example2_threshold example2_threshold.cxx) + ADD_EXECUTABLE(vepl_example_x_gradient example_x_gradient.cxx) + ADD_EXECUTABLE(vepl_example_histogram example_histogram.cxx) +- +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(example_convert.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(example_std_dev.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +Index: vxl-1.17.0/contrib/tbl/vepl1/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/tbl/vepl1/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/tbl/vepl1/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -30,20 +30,6 @@ + # [only when INSTANTIATE_TEMPLATES not defined:] + # AUX_SOURCE_DIRECTORY(Templates vepl1_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(vepl1_threshold.cxx PROPERTIES COMPILE_FLAGS -O2) +- SET_SOURCE_FILES_PROPERTIES(vepl1_add_random_noise.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl1_dyadic.cxx PROPERTIES COMPILE_FLAGS -O3) +- SET_SOURCE_FILES_PROPERTIES(vepl1_dilate_disk.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl1_erode_disk.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl1_median.cxx PROPERTIES COMPILE_FLAGS -O3) +- SET_SOURCE_FILES_PROPERTIES(vepl1_moment.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(vepl1_histogram.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(Templates/vepl1_convert+uchar-.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(Templates/vepl1_convert+short-.cxx PROPERTIES COMPILE_FLAGS -O1) +- SET_SOURCE_FILES_PROPERTIES(Templates/vepl1_convert+float-.cxx PROPERTIES COMPILE_FLAGS -O1) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(vepl1 ${vepl1_sources}) + SET_TARGET_PROPERTIES(vepl1 PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib vepl1) +Index: vxl-1.17.0/contrib/tbl/vepl1/examples/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/tbl/vepl1/examples/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/tbl/vepl1/examples/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -26,8 +26,3 @@ + ADD_EXECUTABLE(vepl1_example2_threshold example2_threshold.cxx) + ADD_EXECUTABLE(vepl1_example_x_gradient example_x_gradient.cxx) + ADD_EXECUTABLE(vepl1_example_histogram example_histogram.cxx) +- +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(example_convert.cxx PROPERTIES COMPILE_FLAGS -O0) +- SET_SOURCE_FILES_PROPERTIES(example_std_dev.cxx PROPERTIES COMPILE_FLAGS -O3) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +Index: vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/gel/gevd/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -28,10 +28,6 @@ + gevd_region_proc_params.cxx gevd_region_proc_params.h + ) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(gevd_contour.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(gevd ${gevd_sources}) + SET_TARGET_PROPERTIES(gevd PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib gevd) +Index: vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/gel/vtol/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -30,10 +30,6 @@ + + AUX_SOURCE_DIRECTORY(Templates vtol_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(vtol_two_chain.cxx PROPERTIES COMPILE_FLAGS -O1) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(vtol ${vtol_sources}) + SET_TARGET_PROPERTIES(vtol PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib vtol) +Index: vxl-1.17.0/contrib/gel/vtol/tests/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/gel/vtol/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/gel/vtol/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -15,9 +15,6 @@ + + test_extract_topology.cxx + ) +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(test_cycle_processor.cxx PROPERTIES COMPILE_FLAGS -O1) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) + + TARGET_LINK_LIBRARIES( vtol_test_all vtol_algo vtol vsol vdgl vnl vil vul testlib ) + +Index: vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/oxl/mvl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -108,10 +108,6 @@ + ) + AUX_SOURCE_DIRECTORY(Templates mvl_sources) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(FMatrixComputeRobust.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_LIBRARY(mvl ${mvl_sources}) + SET_TARGET_PROPERTIES(mvl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib mvl) +Index: vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/oxl/xcv/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 ++++ vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 +@@ -25,11 +25,6 @@ + xcv_axes_limits.cxx xcv_axes_limits.h + ) + +-IF(CMAKE_COMPILER_IS_GNUCXX) +- SET_SOURCE_FILES_PROPERTIES(xcv_geometry.cxx PROPERTIES COMPILE_FLAGS "-O0 -ftemplate-depth-100") +- SET_SOURCE_FILES_PROPERTIES(xcv_multiview.cxx PROPERTIES COMPILE_FLAGS -O0) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) +- + ADD_EXECUTABLE(xcv ${xcv_sources}) + INSTALL_TARGETS(/bin xcv) + TARGET_LINK_LIBRARIES(xcv oxl_osl mvl vgui vgl vil1 vnl vul vcl) Modified: trunk/packages/vxl/trunk/debian/patches/series =================================================================== --- trunk/packages/vxl/trunk/debian/patches/series 2013-11-28 12:44:39 UTC (rev 15301) +++ trunk/packages/vxl/trunk/debian/patches/series 2013-11-28 12:58:33 UTC (rev 15302) @@ -16,3 +16,4 @@ ocl.soname.patch opencl_kfreebsd.patch shared-lib-without-dependency-information.patch +#compflags.patch Modified: trunk/packages/vxl/trunk/debian/patches/shared-lib-without-dependency-information.patch =================================================================== --- trunk/packages/vxl/trunk/debian/patches/shared-lib-without-dependency-information.patch 2013-11-28 12:44:39 UTC (rev 15301) +++ trunk/packages/vxl/trunk/debian/patches/shared-lib-without-dependency-information.patch 2013-11-28 12:58:33 UTC (rev 15302) @@ -7,8 +7,10 @@ Author: Mathieu Malaterre <ma...@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 +Index: vxl-1.17.0/contrib/mul/vil3d/io/vil3d_io_dummy.cxx +=================================================================== +--- vxl-1.17.0.orig/contrib/mul/vil3d/io/vil3d_io_dummy.cxx 2013-11-28 13:47:13.000000000 +0100 ++++ vxl-1.17.0/contrib/mul/vil3d/io/vil3d_io_dummy.cxx 2013-11-28 13:47:52.000000000 +0100 @@ -5,7 +5,5 @@ // This file merely creates some code so that MSVC and other compilers will actually produce a library. @@ -17,8 +19,10 @@ 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 +Index: vxl-1.17.0/contrib/mul/vimt/algo/vimt_dummy.cxx +=================================================================== +--- vxl-1.17.0.orig/contrib/mul/vimt/algo/vimt_dummy.cxx 2013-11-28 13:47:13.000000000 +0100 ++++ vxl-1.17.0/contrib/mul/vimt/algo/vimt_dummy.cxx 2013-11-28 13:47:52.000000000 +0100 @@ -4,6 +4,4 @@ // \author Ian Scott // This file merely creates some code so that MSVC and other compilers will actually produce a library. @@ -26,45 +30,3 @@ -#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 Modified: trunk/packages/vxl/trunk/debian/rules =================================================================== --- trunk/packages/vxl/trunk/debian/rules 2013-11-28 12:44:39 UTC (rev 15301) +++ trunk/packages/vxl/trunk/debian/rules 2013-11-28 12:58:33 UTC (rev 15302) @@ -2,7 +2,7 @@ #export DH_VERBOSE=1 # http://bugs.debian.org/718047 -# http://bugs.debian.org/728574 +# -> debian-release team blessing: http://bugs.debian.org/728574#18 ifneq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU ), ia64) export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed endif _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit