summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 12:11:40 -0400
committeracxz2020-05-24 12:11:40 -0400
commit584a45d03e989a6daf7c5ddb4b51b62dd042abfb (patch)
tree22be024b30c4b8d78823ff3b97c3efaf9ae8e374
parentc9fef44dee5857e7d4ae4847711e371fb82fe1b6 (diff)
downloadaur-ros-noetic-rosemacs.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
2 files changed, 8 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 274a5956f80..219210ddb51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-rosemacs
+pkgbase = ros-noetic-rosemacs
pkgdesc = ROS - ROS tools for those who live in Emacs.
pkgver = 0.4.13
pkgrel = 2
@@ -7,10 +7,10 @@ pkgbase = ros-melodic-rosemacs
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
+ makedepends = ros-noetic-catkin
depends = emacs
- source = ros-melodic-rosemacs-0.4.13.tar.gz::https://github.com/code-iai/ros_emacs_utils/archive/0.4.13.tar.gz
+ source = ros-noetic-rosemacs-0.4.13.tar.gz::https://github.com/code-iai/ros_emacs_utils/archive/0.4.13.tar.gz
sha256sums = 14c8463b3c354a53659843c82af416a4ff6713747f04da98e8fc39de90c8ec6c
-pkgname = ros-melodic-rosemacs
+pkgname = ros-noetic-rosemacs
diff --git a/PKGBUILD b/PKGBUILD
index fd14b95f142..7e91879f3c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
pkgdesc="ROS - ROS tools for those who live in Emacs."
url='https://wiki.ros.org/rosemacs'
-pkgname='ros-melodic-rosemacs'
+pkgname='ros-noetic-rosemacs'
pkgver='0.4.13'
arch=('any')
pkgrel=2
license=('BSD')
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
@@ -24,24 +24,17 @@ sha256sums=('14c8463b3c354a53659843c82af416a4ff6713747f04da98e8fc39de90c8ec6c')
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 2 ${srcdir}/${_dir}
-
# Build project
cmake ${srcdir}/${_dir} \
- -DCMAKE_BUILD_TYPE=Release \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
- -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-DPYTHON_EXECUTABLE=/usr/bin/python \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DPYTHON_BASENAME=-python2.7 \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}