[yarp] 104/109: Refresh patches
Daniele E. Domenichelli
drdanz-guest at moszumanska.debian.org
Thu Jun 22 16:10:22 UTC 2017
This is an automated email from the git hooks/post-receive script.
drdanz-guest pushed a commit to branch master
in repository yarp.
commit 3a99a3259956491afad6139560fb7ff57159c5dd
Author: Daniele E. Domenichelli <ddomenichelli at drdanz.it>
Date: Tue Nov 29 17:31:39 2016 +0100
Refresh patches
---
...e-libraries-static-and-do-not-install-the.patch | 229 ++++++++++-----------
...eate-python2-and-python3-bindings-at-the-.patch | 65 +++---
...-sig1-shlib-calls-exit-usr-lib-x86_64-lin.patch | 2 +-
3 files changed, 147 insertions(+), 149 deletions(-)
diff --git a/debian/patches/0001-Make-private-libraries-static-and-do-not-install-the.patch b/debian/patches/0001-Make-private-libraries-static-and-do-not-install-the.patch
index 1842e44..ce32c94 100644
--- a/debian/patches/0001-Make-private-libraries-static-and-do-not-install-the.patch
+++ b/debian/patches/0001-Make-private-libraries-static-and-do-not-install-the.patch
@@ -4,70 +4,74 @@ Subject: Make private libraries static and do not install the libraries and
the headers
---
- src/carriers/CMakeLists.txt | 20 ++++++++++----------
- src/carriers/wire_rep_utils/CMakeLists.txt | 14 +++++++-------
- src/libYARP_logger/CMakeLists.txt | 20 ++++++++++----------
- src/libYARP_manager/CMakeLists.txt | 20 ++++++++++----------
- src/libYARP_name/CMakeLists.txt | 26 +++++++++++++-------------
- src/libYARP_serversql/CMakeLists.txt | 20 ++++++++++----------
- src/modules/CMakeLists.txt | 20 ++++++++++----------
+ src/carriers/CMakeLists.txt | 20 ++++++++++----------
+ src/devices/CMakeLists.txt | 20 ++++++++++----------
+ src/libYARP_logger/CMakeLists.txt | 20 ++++++++++----------
+ src/libYARP_manager/CMakeLists.txt | 20 ++++++++++----------
+ src/libYARP_name/CMakeLists.txt | 26 +++++++++++++-------------
+ src/libYARP_serversql/CMakeLists.txt | 20 ++++++++++----------
+ src/libYARP_wire_rep_utils/CMakeLists.txt | 14 +++++++-------
7 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/src/carriers/CMakeLists.txt b/src/carriers/CMakeLists.txt
-index b8d22db..ae98b98 100644
+index 7493718..8d67343 100644
--- a/src/carriers/CMakeLists.txt
+++ b/src/carriers/CMakeLists.txt
-@@ -26,15 +26,15 @@ if(CREATE_OPTIONAL_CARRIERS)
- add_subdirectory(priority_carrier)
- add_subdirectory(portmonitor_carrier)
- YARP_END_PLUGIN_LIBRARY(yarpcar)
-- install(TARGETS yarpcar
-- EXPORT YARP
-- COMPONENT runtime
-- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+@@ -19,16 +19,16 @@ yarp_begin_plugin_library(yarpcar)
+ add_subdirectory(portmonitor_carrier)
+ add_subdirectory(depth_image_portmonitor)
+ yarp_end_plugin_library(yarpcar)
+-install(TARGETS yarpcar
+- EXPORT YARP
+- COMPONENT runtime
+- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-
-- if(YARP_LINK_PLUGINS)
-- set_property(GLOBAL APPEND PROPERTY YARP_LIBS yarpcar ${yarpcar_LIBRARIES})
-- endif()
-+# install(TARGETS yarpcar
-+# EXPORT YARP
-+# COMPONENT runtime
-+# RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+# LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+# ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-if(YARP_LINK_PLUGINS)
+- set_property(GLOBAL APPEND PROPERTY YARP_LIBS yarpcar ${yarpcar_LIBRARIES})
+-endif()
++# install(TARGETS yarpcar
++# EXPORT YARP
++# COMPONENT runtime
++# RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++# LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++# ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+#
-+# if(YARP_LINK_PLUGINS)
-+# set_property(GLOBAL APPEND PROPERTY YARP_LIBS yarpcar ${yarpcar_LIBRARIES})
-+# endif()
++# if(YARP_LINK_PLUGINS)
++# set_property(GLOBAL APPEND PROPERTY YARP_LIBS yarpcar ${yarpcar_LIBRARIES})
++# endif()
- endif()
-diff --git a/src/carriers/wire_rep_utils/CMakeLists.txt b/src/carriers/wire_rep_utils/CMakeLists.txt
-index b5f9d22..434ecef 100644
---- a/src/carriers/wire_rep_utils/CMakeLists.txt
-+++ b/src/carriers/wire_rep_utils/CMakeLists.txt
-@@ -19,13 +19,13 @@ if(ENABLE_yarpcar_mjpeg_carrier OR ENABLE_yarpcar_tcpros_carrier)
- target_link_libraries(YARP_wire_rep_utils LINK_PRIVATE ${ACE_LIBRARIES})
+ include(YarpDeprecatedOption)
+ yarp_renamed_option(ENABLE_yarpcar_bayer_carrier ENABLE_yarpcar_bayer) # since YARP 2.3.68
+diff --git a/src/devices/CMakeLists.txt b/src/devices/CMakeLists.txt
+index 5793618..68d6f78 100644
+--- a/src/devices/CMakeLists.txt
++++ b/src/devices/CMakeLists.txt
+@@ -86,13 +86,13 @@ endforeach(EXTFILE)
- set_property(TARGET YARP_wire_rep_utils PROPERTY INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
-- set_property(GLOBAL APPEND PROPERTY YARP_LIBS YARP_wire_rep_utils)
-- install(TARGETS YARP_wire_rep_utils
-- EXPORT YARP
-- COMPONENT runtime
-- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+# set_property(GLOBAL APPEND PROPERTY YARP_LIBS YARP_wire_rep_utils)
-+# install(TARGETS YARP_wire_rep_utils
-+# EXPORT YARP
-+# COMPONENT runtime
-+# RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+# LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+# ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ yarp_end_plugin_library(yarpmod)
- if(YARP_COMPILE_TESTS)
- add_executable(wire_rep_test test.cpp)
+-install(TARGETS yarpmod
+- EXPORT YARP
+- COMPONENT runtime
+- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-
+-if (YARP_LINK_PLUGINS)
+- set_property(GLOBAL APPEND PROPERTY YARP_LIBS yarpmod ${yarpmod_LIBRARIES})
+-endif()
++# install(TARGETS yarpmod
++# EXPORT YARP
++# COMPONENT runtime
++# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++# ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++#
++# if (YARP_LINK_PLUGINS)
++# set_property(GLOBAL APPEND PROPERTY YARP_LIBS yarpmod ${yarpmod_LIBRARIES})
++# endif()
diff --git a/src/libYARP_logger/CMakeLists.txt b/src/libYARP_logger/CMakeLists.txt
index 5dbd5d9..ffba094 100644
--- a/src/libYARP_logger/CMakeLists.txt
@@ -128,52 +132,51 @@ index 0547c4b..b0bec81 100644
set_property(TARGET YARP_manager PROPERTY INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/include)
endif()
diff --git a/src/libYARP_name/CMakeLists.txt b/src/libYARP_name/CMakeLists.txt
-index 1a103fa..1d7afe7 100644
+index dd65a33..2e86041 100644
--- a/src/libYARP_name/CMakeLists.txt
+++ b/src/libYARP_name/CMakeLists.txt
-@@ -28,24 +28,24 @@ if (YARP_USE_PERSISTENT_NAMESERVER)
- include_directories(${YARP_TREE_INCLUDE_DIRS})
- include_directories(SYSTEM ${ACE_INCLUDE_DIRS})
+@@ -26,23 +26,23 @@ get_property(YARP_TREE_INCLUDE_DIRS GLOBAL PROPERTY YARP_TREE_INCLUDE_DIRS)
+ include_directories(${YARP_TREE_INCLUDE_DIRS})
+ include_directories(SYSTEM ${ACE_INCLUDE_DIRS})
-- add_library(YARP_name ${YARP_name_SRCS}
-- ${YARP_name_HDRS}
-- ${YARP_name_IMPL_HDRS})
-+ add_library(YARP_name STATIC ${YARP_name_SRCS}
-+ ${YARP_name_HDRS}
-+ ${YARP_name_IMPL_HDRS})
- target_link_libraries(YARP_name LINK_PRIVATE YARP_OS)
- target_link_libraries(YARP_name LINK_PRIVATE ${ACE_LIBRARIES})
+-add_library(YARP_name ${YARP_name_SRCS}
+- ${YARP_name_HDRS}
+- ${YARP_name_IMPL_HDRS})
++add_library(YARP_name STATIC ${YARP_name_SRCS}
++ ${YARP_name_HDRS}
++ ${YARP_name_IMPL_HDRS})
+ target_link_libraries(YARP_name LINK_PRIVATE YARP_OS)
+ target_link_libraries(YARP_name LINK_PRIVATE ${ACE_LIBRARIES})
- set_property(TARGET YARP_name PROPERTY PUBLIC_HEADER ${YARP_name_HDRS})
- set_property(TARGET YARP_name PROPERTY PRIVATE_HEADER ${YARP_name_IMPL_HDRS})
+ set_property(TARGET YARP_name PROPERTY PUBLIC_HEADER ${YARP_name_HDRS})
+ set_property(TARGET YARP_name PROPERTY PRIVATE_HEADER ${YARP_name_IMPL_HDRS})
-- install(TARGETS YARP_name
-- EXPORT YARP
-- COMPONENT runtime
-- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/yarp/name"
-- PRIVATE_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/yarp/name/impl")
+-install(TARGETS YARP_name
+- EXPORT YARP
+- COMPONENT runtime
+- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/yarp/name"
+- PRIVATE_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/yarp/name/impl")
-
-- set_property(GLOBAL APPEND PROPERTY YARP_LIBS YARP_name)
-+# install(TARGETS YARP_name
-+# EXPORT YARP
-+# COMPONENT runtime
-+# RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+# LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+# ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+# PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/yarp/name"
-+# PRIVATE_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/yarp/name/impl")
+-set_property(GLOBAL APPEND PROPERTY YARP_LIBS YARP_name)
++# install(TARGETS YARP_name
++# EXPORT YARP
++# COMPONENT runtime
++# RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++# LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++# ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++# PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/yarp/name"
++# PRIVATE_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/yarp/name/impl")
+#
-+# set_property(GLOBAL APPEND PROPERTY YARP_LIBS YARP_name)
- set_property(TARGET YARP_name PROPERTY INCLUDE_DIRS ${YARP_TREE_INCLUDE_DIRS})
- endif()
++# set_property(GLOBAL APPEND PROPERTY YARP_LIBS YARP_name)
+ set_property(TARGET YARP_name PROPERTY INCLUDE_DIRS ${YARP_TREE_INCLUDE_DIRS})
diff --git a/src/libYARP_serversql/CMakeLists.txt b/src/libYARP_serversql/CMakeLists.txt
-index ea835e5..4a1a177 100644
+index 09206b8..ee71290 100644
--- a/src/libYARP_serversql/CMakeLists.txt
+++ b/src/libYARP_serversql/CMakeLists.txt
-@@ -50,16 +50,16 @@ endif()
+@@ -54,15 +54,15 @@ endif()
set_property(TARGET YARP_serversql PROPERTY PUBLIC_HEADER ${YARP_serversql_HDRS})
set_property(TARGET YARP_serversql PROPERTY PRIVATE_HEADER ${YARP_serversql_IMPL_HDRS})
@@ -197,36 +200,28 @@ index ea835e5..4a1a177 100644
+# PRIVATE_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/yarp/serversql/impl")
+#
+# set_property(GLOBAL APPEND PROPERTY YARP_LIBS YARP_serversql)
- set_property(TARGET YARP_serversql PROPERTY INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/include
- ${YARP_OS_INCLUDE_DIRS})
+ set_property(TARGET YARP_serversql PROPERTY INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
+ ${YARP_OS_INCLUDE_DIRS})
+diff --git a/src/libYARP_wire_rep_utils/CMakeLists.txt b/src/libYARP_wire_rep_utils/CMakeLists.txt
+index 1d66e64..a86b054 100644
+--- a/src/libYARP_wire_rep_utils/CMakeLists.txt
++++ b/src/libYARP_wire_rep_utils/CMakeLists.txt
+@@ -20,11 +20,11 @@ if(CREATE_OPTIONAL_CARRIERS)
+ ${ACE_LIBRARIES})
-diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
-index 38c0b1c..c0c6616 100644
---- a/src/modules/CMakeLists.txt
-+++ b/src/modules/CMakeLists.txt
-@@ -81,15 +81,15 @@ if (CREATE_DEVICE_LIBRARY_MODULES)
-
- YARP_END_PLUGIN_LIBRARY(yarpmod)
-
-- install(TARGETS yarpmod
+ set_property(TARGET YARP_wire_rep_utils PROPERTY INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
+- set_property(GLOBAL APPEND PROPERTY YARP_LIBS YARP_wire_rep_utils)
+- install(TARGETS YARP_wire_rep_utils
- EXPORT YARP
- COMPONENT runtime
-- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--
-- if (YARP_LINK_PLUGINS)
-- set_property(GLOBAL APPEND PROPERTY YARP_LIBS yarpmod ${yarpmod_LIBRARIES})
-- endif()
-+# install(TARGETS yarpmod
+- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++# set_property(GLOBAL APPEND PROPERTY YARP_LIBS YARP_wire_rep_utils)
++# install(TARGETS YARP_wire_rep_utils
+# EXPORT YARP
+# COMPONENT runtime
-+# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+# ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+#
-+# if (YARP_LINK_PLUGINS)
-+# set_property(GLOBAL APPEND PROPERTY YARP_LIBS yarpmod ${yarpmod_LIBRARIES})
-+# endif()
-
++# RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++# LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++# ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
endif()
diff --git a/debian/patches/0002-Allow-to-create-python2-and-python3-bindings-at-the-.patch b/debian/patches/0002-Allow-to-create-python2-and-python3-bindings-at-the-.patch
index 7eaa11d..2ebdfbe 100644
--- a/debian/patches/0002-Allow-to-create-python2-and-python3-bindings-at-the-.patch
+++ b/debian/patches/0002-Allow-to-create-python2-and-python3-bindings-at-the-.patch
@@ -3,11 +3,11 @@ Date: Fri, 21 Oct 2016 10:40:22 +0200
Subject: Allow to create python2 and python3 bindings at the same time
---
- bindings/CMakeLists.txt | 241 +++++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 210 insertions(+), 31 deletions(-)
+ bindings/CMakeLists.txt | 244 ++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 213 insertions(+), 31 deletions(-)
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
-index 2e915d2..996ee0d 100644
+index 909d2b6..4938067 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -25,7 +25,8 @@ option(YARP_COMPILE_BINDINGS "Compile optional language bindings" ${YARP_COMPILE
@@ -20,30 +20,15 @@ index 2e915d2..996ee0d 100644
"Perl"
"Chicken Scheme"
"CSharp"
-@@ -177,31 +178,125 @@ endif(CREATE_JAVA)
+@@ -183,31 +184,126 @@ endif(CREATE_JAVA)
+
#############################################################################
-## Create Python bindings
-
--if(CREATE_PYTHON)
-- set(CMAKE_SWIG_FLAGS "-Wall;-module;yarp;-threads;${SWIG_COMMON_FLAGS}")
-- if(CREATE_PYTHON_VERSION)
-- message(WARNING "CREATE_PYTHON_VERSION was renamed YARP_USE_PYTHON_VERSION")
-- set(YARP_USE_PYTHON_VERSION "${CREATE_PYTHON_VERSION}" CACHE STRING "Specify python version to use" )
-- unset(CREATE_PYTHON_VERSION CACHE)
-- else()
-- set(YARP_USE_PYTHON_VERSION "" CACHE STRING "Specify python version to use" )
-- endif()
-- find_package(PythonInterp ${YARP_USE_PYTHON_VERSION} REQUIRED)
-- set(YARP_USE_PYTHON_VERSION_ARGS)
-- if(NOT YARP_USE_PYTHON_VERSION)
-- set (YARP_USE_PYTHON_VERSION ${PYTHON_VERSION_STRING})
-- endif()
-- find_package(PythonLibs ${YARP_USE_PYTHON_VERSION} EXACT)
-- include_directories(SYSTEM ${PYTHON_INCLUDE_PATH})
++## A macro to support different verisons of Python
++
+macro(find_python _py)
+ set(_cache_vars _EXECUTABLE
+ _DEBUG_LIBRARY
@@ -134,13 +119,29 @@ index 2e915d2..996ee0d 100644
+endmacro()
+
+-if(CREATE_PYTHON)
+- set(CMAKE_SWIG_FLAGS "-Wall;-module;yarp;-threads;${SWIG_COMMON_FLAGS}")
+- if(CREATE_PYTHON_VERSION)
+- message(WARNING "CREATE_PYTHON_VERSION was renamed YARP_USE_PYTHON_VERSION")
+- set(YARP_USE_PYTHON_VERSION "${CREATE_PYTHON_VERSION}" CACHE STRING "Specify python version to use" )
+- unset(CREATE_PYTHON_VERSION CACHE)
+- else()
+- set(YARP_USE_PYTHON_VERSION "" CACHE STRING "Specify python version to use" )
+- endif()
+- find_package(PythonInterp ${YARP_USE_PYTHON_VERSION} REQUIRED)
+- set(YARP_USE_PYTHON_VERSION_ARGS)
+- if(NOT YARP_USE_PYTHON_VERSION)
+- set (YARP_USE_PYTHON_VERSION ${PYTHON_VERSION_STRING})
+- endif()
+- find_package(PythonLibs ${YARP_USE_PYTHON_VERSION} EXACT)
+- include_directories(SYSTEM ${PYTHON_INCLUDE_PATH})
+
- ## in Windows it seems necessary to declare explictly the link_directory
- if(WIN32)
- get_filename_component(PYTHON_DIR ${PYTHON_LIBRARY} PATH)
- link_directories(${PYTHON_DIR})
- endif()
+
-+
+#############################################################################
+## Create Python 2 bindings
+
@@ -168,10 +169,10 @@ index 2e915d2..996ee0d 100644
set(target_name yarp)
if(YARP_COLLISION_AVOIDANCE)
-@@ -210,29 +305,45 @@ if(CREATE_PYTHON)
- set(CMAKE_SWIG_OUTDIR "${CMAKE_BINARY_DIR}/lib/python")
- endif()
- swig_add_module(${target_name} python yarp.i)
+@@ -218,29 +314,45 @@ if(CREATE_PYTHON)
+ swig_add_library(${target_name}
+ LANGUAGE python
+ SOURCES yarp.i)
- target_link_libraries(_${target_name} ${PYTHON_LIBRARY})
# uncomment if we want a debug version of the library
#add_definitions(-DPy_DEBUG)
@@ -209,7 +210,7 @@ index 2e915d2..996ee0d 100644
+Name: yarp
+Version: ${YARP_VERSION}
+Summary: Python bindings for \"Yet Another Robot Platform\" (YARP)
-+Home-page: http://yarp.it
++Home-page: http://yarp.it/
+Author: YARP Developers
+Author-email: yarp0-devel at lists.sourceforge.net
+License: LGPLv2.1+
@@ -221,7 +222,7 @@ index 2e915d2..996ee0d 100644
if(WIN32)
set_target_properties(_${target_name} PROPERTIES SUFFIX ".pyd")
endif(WIN32)
-@@ -242,8 +353,76 @@ if(CREATE_PYTHON)
+@@ -250,8 +362,78 @@ if(CREATE_PYTHON)
else()
set(YARP_COLLISION_AVOIDANCE TRUE)
endif()
@@ -233,7 +234,7 @@ index 2e915d2..996ee0d 100644
+## Create Python 3 bindings
+
+
-
++
+if(CREATE_PYTHON3)
+
+ find_python(3)
@@ -246,7 +247,9 @@ index 2e915d2..996ee0d 100644
+ set(CMAKE_SWIG_OUTDIR_SAVE ${CMAKE_SWIG_OUTDIR})
+ set(CMAKE_SWIG_OUTDIR "${CMAKE_BINARY_DIR}/lib/python3")
+ endif()
-+ swig_add_module(${target_name} python yarp.i)
++ swig_add_library(${target_name}
++ LANGUAGE python
++ SOURCES yarp.i)
+ # uncomment if we want a debug version of the library
+ #add_definitions(-DPy_DEBUG)
+
@@ -256,7 +259,7 @@ index 2e915d2..996ee0d 100644
+ if(YARP_COLLISION_AVOIDANCE)
+ set_target_properties(_${target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/python3")
+ endif()
-+
+
+ # installation path is determined reliably on most platforms using distutils
+ execute_process(COMMAND ${PYTHON3_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix=''))"
+ OUTPUT_VARIABLE PYTHON3_INSTDIR
diff --git a/debian/patches/0003-Fix-libyarp-sig1-shlib-calls-exit-usr-lib-x86_64-lin.patch b/debian/patches/0003-Fix-libyarp-sig1-shlib-calls-exit-usr-lib-x86_64-lin.patch
index 47c2c27..3fb6cd9 100644
--- a/debian/patches/0003-Fix-libyarp-sig1-shlib-calls-exit-usr-lib-x86_64-lin.patch
+++ b/debian/patches/0003-Fix-libyarp-sig1-shlib-calls-exit-usr-lib-x86_64-lin.patch
@@ -9,7 +9,7 @@ Subject: Fix "libyarp-sig1: shlib-calls-exit
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libYARP_sig/src/Image.cpp b/src/libYARP_sig/src/Image.cpp
-index 7f139dd..f5d34d1 100644
+index 5010e23..fe4138e 100644
--- a/src/libYARP_sig/src/Image.cpp
+++ b/src/libYARP_sig/src/Image.cpp
@@ -531,7 +531,7 @@ void ImageStorage::_set_ipl_header(int x, int y, int pixel_type, int quantum,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yarp.git
More information about the debian-science-commits
mailing list