From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 04963139694 for ; Sun, 23 Apr 2017 13:54:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52832E0C94; Sun, 23 Apr 2017 13:54:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24C90E0C94 for ; Sun, 23 Apr 2017 13:54:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB603340BEA for ; Sun, 23 Apr 2017 13:54:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32E6F7437 for ; Sun, 23 Apr 2017 13:54:38 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1492955672.a31fbc56824b5b8c3cedf1be833608ec0cd6b2f5.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rospack/files/, dev-ros/rospack/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/rospack/files/multipy.patch dev-ros/rospack/rospack-2.4.1.ebuild dev-ros/rospack/rospack-9999.ebuild X-VCS-Directories: dev-ros/rospack/ dev-ros/rospack/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: a31fbc56824b5b8c3cedf1be833608ec0cd6b2f5 X-VCS-Branch: master Date: Sun, 23 Apr 2017 13:54:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 31b49d6d-fdfd-426f-bf2f-7b4c51adfe0f X-Archives-Hash: 94f94126673f542e4b34e4f40a482c69 commit: a31fbc56824b5b8c3cedf1be833608ec0cd6b2f5 Author: Alexis Ballier gentoo org> AuthorDate: Sun Apr 23 13:54:10 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Sun Apr 23 13:54:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31fbc56 dev-ros/rospack: Drop python-single-r1 hack, build libraries linking to different python implementations and install a compat symlink for now. Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-ros/rospack/files/multipy.patch | 40 ++++++++++++++++++++++++++++++++++++ dev-ros/rospack/rospack-2.4.1.ebuild | 18 +++++++++++----- dev-ros/rospack/rospack-9999.ebuild | 18 +++++++++++----- 3 files changed, 66 insertions(+), 10 deletions(-) diff --git a/dev-ros/rospack/files/multipy.patch b/dev-ros/rospack/files/multipy.patch new file mode 100644 index 00000000000..8350cc0a8da --- /dev/null +++ b/dev-ros/rospack/files/multipy.patch @@ -0,0 +1,40 @@ +Install separate libraries linking to different python implementations. + +Index: rospack-2.4.1/CMakeLists.txt +=================================================================== +--- rospack-2.4.1.orig/CMakeLists.txt ++++ rospack-2.4.1/CMakeLists.txt +@@ -23,28 +23,28 @@ endif() + + include_directories(include ${TinyXML2_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) + +-add_library(rospack ++add_library(rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} + src/rospack.cpp + ${backcompat_source} + src/rospack_cmdline.cpp + src/utils.cpp + ) +-target_link_libraries(rospack ${TinyXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) ++target_link_libraries(rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${TinyXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) + + add_executable(rospackexe src/rospack_main.cpp) + # Set the name, and make it a "global" executable + set_target_properties(rospackexe PROPERTIES + OUTPUT_NAME rospack + RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin) +-target_link_libraries(rospackexe rospack ${Boost_LIBRARIES}) ++target_link_libraries(rospackexe rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${Boost_LIBRARIES}) + add_executable(rosstackexe src/rosstack_main.cpp) +-target_link_libraries(rosstackexe rospack ${Boost_LIBRARIES}) ++target_link_libraries(rosstackexe rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${Boost_LIBRARIES}) + # Set the name, and make it a "global" executable + set_target_properties(rosstackexe PROPERTIES + OUTPUT_NAME rosstack + RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin) + +-install(TARGETS rospack rospackexe rosstackexe ++install(TARGETS rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} rospackexe rosstackexe + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}) diff --git a/dev-ros/rospack/rospack-2.4.1.ebuild b/dev-ros/rospack/rospack-2.4.1.ebuild index b7223c71000..7d49abfd959 100644 --- a/dev-ros/rospack/rospack-2.4.1.ebuild +++ b/dev-ros/rospack/rospack-2.4.1.ebuild @@ -5,13 +5,10 @@ EAPI=5 ROS_REPO_URI="https://github.com/ros/rospack" KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit ros-catkin -# Do it that way to avoid ros-catkin pulling in python-r1 -PYTHON_COMPAT=( python{2_7,3_4} ) -inherit python-single-r1 - DESCRIPTION="Retrieves information about ROS packages available on the filesystem" LICENSE="BSD" @@ -30,4 +27,15 @@ DEPEND="${RDEPEND} dev-python/nose )" -PATCHES=( "${FILESDIR}/gentoo.patch" ) +PATCHES=( + "${FILESDIR}/gentoo.patch" + "${FILESDIR}/multipy.patch" +) + +src_install() { + ros-catkin_src_install + # Assume greatest alphabetically is what we want as default implementation + for i in "${ED}"/usr/$(get_libdir)/librospack*.so ; do + dosym $(basename "${i}") /usr/$(get_libdir)/librospack.so + done +} diff --git a/dev-ros/rospack/rospack-9999.ebuild b/dev-ros/rospack/rospack-9999.ebuild index b7223c71000..7d49abfd959 100644 --- a/dev-ros/rospack/rospack-9999.ebuild +++ b/dev-ros/rospack/rospack-9999.ebuild @@ -5,13 +5,10 @@ EAPI=5 ROS_REPO_URI="https://github.com/ros/rospack" KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit ros-catkin -# Do it that way to avoid ros-catkin pulling in python-r1 -PYTHON_COMPAT=( python{2_7,3_4} ) -inherit python-single-r1 - DESCRIPTION="Retrieves information about ROS packages available on the filesystem" LICENSE="BSD" @@ -30,4 +27,15 @@ DEPEND="${RDEPEND} dev-python/nose )" -PATCHES=( "${FILESDIR}/gentoo.patch" ) +PATCHES=( + "${FILESDIR}/gentoo.patch" + "${FILESDIR}/multipy.patch" +) + +src_install() { + ros-catkin_src_install + # Assume greatest alphabetically is what we want as default implementation + for i in "${ED}"/usr/$(get_libdir)/librospack*.so ; do + dosym $(basename "${i}") /usr/$(get_libdir)/librospack.so + done +}