diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 21 | ||||
| -rw-r--r-- | python3.6.patch | 13 |
3 files changed, 27 insertions, 11 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Tue Dec 19 18:44:21 UTC 2017 +# Thu Dec 21 22:29:50 UTC 2017 pkgbase = ros-ardent-ros-workspace pkgdesc = ROS - Provides the prefix level environment files for ROS 2 packages. pkgver = 0.4.0 @@ -11,7 +11,9 @@ pkgbase = ros-ardent-ros-workspace makedepends = ros-build-tools makedepends = ros-ardent-ament-cmake-core source = ros-ardent-ros-workspace-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ros_workspace-release/archive/release/ardent/ros_workspace/0.4.0-0.tar.gz + source = python3.6.patch sha256sums = da21d49fa61687f2f1985ba0a2798c05fcf433dcabf91a11085c683379e7a56c + sha256sums = e7e08cfc7698a98d1a9e4e12969758247c900bc9f1c367fa382b48265b6679cf pkgname = ros-ardent-ros-workspace @@ -25,8 +25,13 @@ depends=(${ros_depends[@]}) # Tarball version (faster download) _dir="ros_workspace-release-release-ardent-ros_workspace-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/ros_workspace-release/archive/release/ardent/ros_workspace/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('da21d49fa61687f2f1985ba0a2798c05fcf433dcabf91a11085c683379e7a56c') +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/ros_workspace-release/archive/release/ardent/ros_workspace/${pkgver}-${_pkgver_patch}.tar.gz" "python3.6.patch") +sha256sums=('da21d49fa61687f2f1985ba0a2798c05fcf433dcabf91a11085c683379e7a56c' "e7e08cfc7698a98d1a9e4e12969758247c900bc9f1c367fa382b48265b6679cf") + +prepare() { + cd "${srcdir}" + patch -Np1 -i "python3.6.patch" +} build() { # Use ROS environment variables @@ -40,17 +45,13 @@ build() { # Fix Python2/Python3 conflicts /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}" + export PYTHONPATH=/opt/ros/ardent/lib/python3.6/site-packages + # Build project cmake "${srcdir}/${_dir}" \ -DCMAKE_BUILD_TYPE=Release \ - -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \ - -DPYTHON_BASENAME=.cpython-35m \ - -DSETUPTOOLS_DEB_LAYOUT=OFF \ - -DCATKIN_ENABLE_TESTING=OFF + -DBUILD_TESTING=Off \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent make } diff --git a/python3.6.patch b/python3.6.patch new file mode 100644 index 000000000000..71d89a01d697 --- /dev/null +++ b/python3.6.patch @@ -0,0 +1,13 @@ +Only in patched: build +diff -ura orig/ros_workspace-release-release-ardent-ros_workspace-0.4.0-0/CMakeLists.txt patched/ros_workspace-release-release-ardent-ros_workspace-0.4.0-0/CMakeLists.txt +--- orig/ros_workspace-release-release-ardent-ros_workspace-0.4.0-0/CMakeLists.txt 2017-12-09 05:27:00.000000000 +0100 ++++ patched/ros_workspace-release-release-ardent-ros_workspace-0.4.0-0/CMakeLists.txt 2017-12-20 22:15:29.467345783 +0100 +@@ -3,7 +3,7 @@ + + find_package(ament_cmake_core REQUIRED) + +-set(PYTHON_INSTALL_DIR "lib/python3.5/site-packages") ++set(PYTHON_INSTALL_DIR "lib/python3.6/site-packages") + set(ament_cmake_package_templates_ENVIRONMENT_HOOK_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}/ament_package/template/environment_hook/pythonpath.sh.in") + ament_environment_hooks("${ament_cmake_package_templates_ENVIRONMENT_HOOK_PYTHONPATH}") + |