summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 11:30:55 -0400
committeracxz2020-05-24 11:30:55 -0400
commitcd5d68a20f303acfea6cecbc6295aadb167df44f (patch)
tree81d49029ca6da2f99bd64c4e19725d3c632b3f50
parent0276a546edf893f95d2c989879f05c12bd373b7b (diff)
downloadaur-cd5d68a20f303acfea6cecbc6295aadb167df44f.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD25
2 files changed, 17 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1e494a90114..67543159919 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-common-tutorials
+pkgbase = ros-noetic-common-tutorials
pkgdesc = ROS - Metapackage that contains common tutorials.
pkgver = 0.1.11
pkgrel = 2
@@ -7,13 +7,13 @@ pkgbase = ros-melodic-common-tutorials
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
- depends = ros-melodic-pluginlib-tutorials
- depends = ros-melodic-turtle-actionlib
- depends = ros-melodic-nodelet-tutorial-math
- depends = ros-melodic-actionlib-tutorials
- source = ros-melodic-common-tutorials-0.1.11.tar.gz::https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-pluginlib-tutorials
+ depends = ros-noetic-turtle-actionlib
+ depends = ros-noetic-nodelet-tutorial-math
+ depends = ros-noetic-actionlib-tutorials
+ source = ros-noetic-common-tutorials-0.1.11.tar.gz::https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz
sha256sums = e6015c289219df58253809254baa53dbf2f3190b61d77fac2b2fb8b8c12f3ec1
-pkgname = ros-melodic-common-tutorials
+pkgname = ros-noetic-common-tutorials
diff --git a/PKGBUILD b/PKGBUILD
index 7fd96a73c6b..c82c338248a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgdesc="ROS - Metapackage that contains common tutorials."
url='https://wiki.ros.org/common_tutorials'
-pkgname='ros-melodic-common-tutorials'
+pkgname='ros-noetic-common-tutorials'
pkgver='0.1.11'
_pkgver_patch=0
arch=('any')
@@ -11,7 +11,7 @@ pkgrel=2
license=('BSD')
ros_makedepends=(
- ros-melodic-catkin
+ ros-noetic-catkin
)
makedepends=(
@@ -21,10 +21,10 @@ makedepends=(
)
ros_depends=(
- ros-melodic-pluginlib-tutorials
- ros-melodic-turtle-actionlib
- ros-melodic-nodelet-tutorial-math
- ros-melodic-actionlib-tutorials
+ ros-noetic-pluginlib-tutorials
+ ros-noetic-turtle-actionlib
+ ros-noetic-nodelet-tutorial-math
+ ros-noetic-actionlib-tutorials
)
depends=(
@@ -38,24 +38,17 @@ sha256sums=('e6015c289219df58253809254baa53dbf2f3190b61d77fac2b2fb8b8c12f3ec1')
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 the 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 the 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=.cpython-37m \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}