summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 12:05:42 -0400
committeracxz2020-05-24 12:05:42 -0400
commiteec0a45ad53cb473726cc832d888faa166d3e932 (patch)
tree2bd124594dd02ca0f5c6c875ca47633ab23aa4ff
parentec1b7f504f0937c3a5a58b51f56cd4dd31e642d2 (diff)
downloadaur-ros-noetic-pr2-description.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD25
2 files changed, 16 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e4191ef85486..41ebf48a2c47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-pr2-description
+pkgbase = ros-noetic-pr2-description
pkgdesc = ROS - This package contains the description (mechanical, kinematic, visual, etc.) of the PR2 robot.
pkgver = 1.12.4
pkgrel = 1
@@ -7,12 +7,12 @@ pkgbase = ros-melodic-pr2-description
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-ivcon
- makedepends = ros-melodic-convex-decomposition
- makedepends = ros-melodic-catkin
- depends = ros-melodic-xacro
- source = ros-melodic-pr2-description-1.12.4.tar.gz::https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz
+ makedepends = ros-noetic-ivcon
+ makedepends = ros-noetic-convex-decomposition
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-xacro
+ source = ros-noetic-pr2-description-1.12.4.tar.gz::https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz
sha256sums = 135c6947f7511bcb3644fa6c0cf5972c309516895737e83f8eeed2b2d069f009
-pkgname = ros-melodic-pr2-description
+pkgname = ros-noetic-pr2-description
diff --git a/PKGBUILD b/PKGBUILD
index 88f5efd2dd30..8f8b86393e8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,23 @@
pkgdesc="ROS - This package contains the description (mechanical, kinematic, visual, etc.) of the PR2 robot."
url='https://wiki.ros.org/pr2_description'
-pkgname='ros-melodic-pr2-description'
+pkgname='ros-noetic-pr2-description'
pkgver='1.12.4'
arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-melodic-ivcon
- ros-melodic-convex-decomposition
- ros-melodic-catkin)
+ros_makedepends=(ros-noetic-ivcon
+ ros-noetic-convex-decomposition
+ ros-noetic-catkin)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-melodic-xacro)
+ros_depends=(ros-noetic-xacro)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
-# _tag=release/melodic/pr2_description/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/pr2_description/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/pr2-gbp/pr2_common-release.git"#tag=${_tag})
# sha256sums=('SKIP')
@@ -31,24 +31,17 @@ sha256sums=('135c6947f7511bcb3644fa6c0cf5972c309516895737e83f8eeed2b2d069f009')
build() {
# Use ROS environment variables
source /usr/share/ros-build-tools/clear-ros-env.sh
- [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+ [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
# Create build directory
[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
cd ${srcdir}/build
- # Fix Python2/Python3 conflicts
- /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
# Build project
cmake ${srcdir}/${_dir} \
- -DCMAKE_BUILD_TYPE=Release \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
- -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
- -DPYTHON_BASENAME=-python3.7m \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}