Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 02bbec06 authored by Olivier Sallou's avatar Olivier Sallou
Browse files

fix on some archs

parent 204d7ec3
No related branches found
No related tags found
No related merge requests found
visp (2.10.0-2) unstable; urgency=medium
* Add patch to fix segfault on sparc, powerpc...
* Override dh_install to avoid an error on hurd where usr/lib/*/visp/*
doesn't exist
-- Fabien Spindler <Fabien.Spindler@inria.fr> Tue, 12 May 2015 14:38:23 +0200
visp (2.10.0-1) unstable; urgency=medium
* Imported Upstream version 2.10.0
......
......@@ -3,4 +3,4 @@ usr/include/*/visp/*
usr/lib/*/libvisp.so
usr/lib/*/cmake/*
usr/lib/*/pkgconfig/*
usr/lib/*/visp/*
#usr/lib/*/visp/*
From 5e0cfb715a74209f1af039198cf4b82488fea677 Mon Sep 17 00:00:00 2001
From: Fabien Spindler <Fabien.Spindler@inria.fr>
Date: Tue, 12 May 2015 10:56:07 +0200
Subject: [PATCH 3/3] Fix segfault on sparc, powerpc...
---
src/tools/io/vpParseArgv.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/io/vpParseArgv.cpp b/src/tools/io/vpParseArgv.cpp
index a662226..6dd569f 100644
--- a/src/tools/io/vpParseArgv.cpp
+++ b/src/tools/io/vpParseArgv.cpp
@@ -173,7 +173,7 @@ vpParseArgv::parse(int *argcPtr, const char **argv, vpArgvInfo *argTable,
infoPtr = matchPtr;
switch (infoPtr->type) {
case ARGV_CONSTANT:
- *((long long *) infoPtr->dst) = 1;
+ *((int *) infoPtr->dst) = 1;
break;
case ARGV_INT:
nargs = (uintptr_t) infoPtr->src;
--
2.1.4
0001-Install-headers-in-include-architecture-triplet.patch
0002-Fix-to-be-able-to-use-the-library-either-from-build-.patch
0003-Fix-segfault-on-sparc-powerpc.patch
......@@ -60,10 +60,11 @@ else
endif
.PHONY: override_dh_auto_configure \
override_dh_auto_build-indep \
override_dh_strip \
override_dh_auto_test
.PHONY: override_dh_auto_configure \
override_dh_auto_build-indep \
override_dh_strip \
override_dh_auto_test \
override_dh_install
%:
dh $@ --parallel
......@@ -101,3 +102,11 @@ endif
override_dh_auto_test:
export VISP_INPUT_IMAGE_PATH=/usr/share/visp-images-data/ \
&& dh_auto_test --max-parallel=1 || ${DH_AUTOTEST_CAN_FAIL}
override_dh_install:
ifneq ($(DEB_HOST_ARCH_OS),hurd)
# On hurd usr/lib/*/visp/* is empty and produces an error
dh_install "usr/lib/*/visp/*" -p libvisp-dev
# Continue zith regular dh_install
dh_install
endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment