Author: malat-guest
Date: 2011-10-25 16:00:52 +0000 (Tue, 25 Oct 2011)
New Revision: 8269
Modified:
trunk/packages/vxl/trunk/debian/README.source
trunk/packages/vxl/trunk/debian/changelog
trunk/packages/vxl/trunk/debian/patches/series
trunk/packages/vxl/trunk/debian/rules
Log:
remove pre-build target
Modified: trunk/packages/vxl/trunk/debian/README.source
===================================================================
--- trunk/packages/vxl/trunk/debian/README.source 2011-10-25 15:20:36 UTC
(rev 8268)
+++ trunk/packages/vxl/trunk/debian/README.source 2011-10-25 16:00:52 UTC
(rev 8269)
@@ -44,3 +44,16 @@
762 - boxm_test_update_multi_bin (OTHER_FAULT)
774 - test_octree_kernel_operator (Failed)
+---
+
+Two files are removed to fix compilation on armel, they lead to duplicate
symbols linker error such as the following:
+
+cd
/build/buildd-vxl_1.14.0-10-armel-8mTKNo/vxl-1.14.0/obj-arm-linux-gnueabi/contrib/brl/bpro/bprb
&& /usr/bin/cmake -E cmake_link_script CMakeFiles/bprb.dir/link.txt --verbose=1
+/usr/bin/c++ -fPIC -g -O2 -fstack-protector --param=ssp-buffer-size=4
-Wformat -Wformat-security -Werror=format-security -Wl,-z,relro -shared
-Wl,-soname,libbprb.so -o ../../../../lib/libbprb.so
CMakeFiles/bprb.dir/bprb_parameters.o CMakeFiles/bprb.dir/bprb_process.o
CMakeFiles/bprb.dir/bprb_process_ext.o
CMakeFiles/bprb.dir/bprb_batch_process_manager.o
CMakeFiles/bprb.dir/bprb_null_process.o
CMakeFiles/bprb.dir/Templates/bprb_parameters+bool-.o
CMakeFiles/bprb.dir/Templates/bprb_parameters+double-.o
CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned-.o
CMakeFiles/bprb.dir/Templates/bprb_parameters+int-.o
CMakeFiles/bprb.dir/Templates/bprb_process_manager+bprb_batch_process_manager-.o
CMakeFiles/bprb.dir/Templates/vbl_smart_ptr+bprb_process-.o
CMakeFiles/bprb.dir/Templates/bprb_parameters+float-.o
CMakeFiles/bprb.dir/Templates/bprb_parameters+vcl_string-.o
CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned_int-.o
CMakeFiles/bprb.dir/Templates/vbl_smart_ptr+bprb_parameters-.o
CMakeFiles/bprb.dir/Templates/bprb_parameters+bprb_filepath-.o
../../../../lib/libbrdb.so ../../../../lib/libbxml.so.1.14.0
../../../../lib/libvbl.so.1.14.0 ../../../../lib/libvsl.so.1.14.0
../../../../lib/libexpatpp.so -lexpat ../../../../lib/libvbl_io.so.1.14.0
../../../../lib/libvbl.so.1.14.0 ../../../../lib/libvsl.so.1.14.0
../../../../lib/libvul.so.1.14.0 ../../../../lib/libvcl.so.1.14.0 -lm
+CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned_int-.o:(.rodata+0xa0):
multiple definition of `typeinfo name for bprb_param_type<unsigned int>'
+CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned-.o:(.rodata+0xa0):
first defined here
+CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned_int-.o:(.data.rel.ro+0x0):
multiple definition of `typeinfo for bprb_param_type<unsigned int>'
+CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned-.o:(.data.rel.ro+0x0):
first defined here
+collect2: ld returned 1 exit status
+make[3]: *** [lib/libbprb.so] Error 1
+make[3]: Leaving directory
`/build/buildd-vxl_1.14.0-10-armel-8mTKNo/vxl-1.14.0/obj-arm-linux-gnueabi'
Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog 2011-10-25 15:20:36 UTC (rev
8268)
+++ trunk/packages/vxl/trunk/debian/changelog 2011-10-25 16:00:52 UTC (rev
8269)
@@ -1,8 +1,9 @@
vxl (1.14.0-11) UNRELEASED; urgency=low
* Fix another compilation issue on alpha
+ * Move pre-build operations in auto_configure, since it was broken
- -- Mathieu Malaterre <[email protected]> Sun, 16 Oct 2011 18:48:04
+0200
+ -- Mathieu Malaterre <[email protected]> Sat, 22 Oct 2011 01:46:01
-0400
vxl (1.14.0-10) unstable; urgency=low
Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series 2011-10-25 15:20:36 UTC
(rev 8268)
+++ trunk/packages/vxl/trunk/debian/patches/series 2011-10-25 16:00:52 UTC
(rev 8269)
@@ -7,4 +7,3 @@
renamelibs.patch
fixcomp.patch
fix_alphacomp.patch
-debian-changes-1.14.0-10
Modified: trunk/packages/vxl/trunk/debian/rules
===================================================================
--- trunk/packages/vxl/trunk/debian/rules 2011-10-25 15:20:36 UTC (rev
8268)
+++ trunk/packages/vxl/trunk/debian/rules 2011-10-25 16:00:52 UTC (rev
8269)
@@ -47,14 +47,11 @@
dh $@ --buildsystem=cmake --parallel
override_dh_auto_configure:
- dh_auto_configure -- $(CMAKE_FLAGS)
-
-pre-build:
- echo "runnning pre-build"
# remove duplicate from bprb_parameters+unsigned_int-.cxx
rm -f
$(CURDIR)/contrib/brl/bpro/bprb/Templates/bprb_parameters+unsigned-.cxx
# remove duplicate from
bvxm_voxel_grid+bsta_num_obs+bsta_mixture_fixed+bsta_num_obs+bsta_gauss_f1-.3---.cxx
rm -f
$(CURDIR)/contrib/brl/bseg/bvxm/grid/Templates/bvxm_voxel_grid+bsta_num_obs+bsta_mixture_fixed+bsta_num_obs+bsta_gaussian_sphere+float.1--.3---.cxx
+ dh_auto_configure -- $(CMAKE_FLAGS)
override_dh_lintian:
echo "$(pkg_lib): package-name-doesnt-match-sonames" >
debian/$(pkg_lib).lintian-overrides
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
