summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 11:40:22 -0400
committeracxz2020-05-24 11:40:22 -0400
commit66c6a399bd0f97364009dc68b9405dee0d33202e (patch)
tree4e9afa8b499b51463c26667af09fbe7897923391
parent85770593e1b50106128dd408b8b0ec368d733875 (diff)
downloadaur-66c6a399bd0f97364009dc68b9405dee0d33202e.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD29
2 files changed, 21 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 391af9e6568..47c35b50a65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-eigen-conversions
+pkgbase = ros-noetic-eigen-conversions
pkgdesc = ROS - Conversion functions between: - Eigen and KDL - Eigen and geometry_msgs.
pkgver = 1.12.0
pkgrel = 2
@@ -7,17 +7,17 @@ pkgbase = ros-melodic-eigen-conversions
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-orocos-kdl
- makedepends = ros-melodic-std-msgs
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-geometry-msgs
+ makedepends = ros-noetic-orocos-kdl
+ makedepends = ros-noetic-std-msgs
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-geometry-msgs
makedepends = eigen3
- depends = ros-melodic-orocos-kdl
- depends = ros-melodic-std-msgs
- depends = ros-melodic-geometry-msgs
+ depends = ros-noetic-orocos-kdl
+ depends = ros-noetic-std-msgs
+ depends = ros-noetic-geometry-msgs
depends = eigen3
- source = ros-melodic-eigen-conversions-1.12.0.tar.gz::https://github.com/ros/geometry/archive/1.12.0.tar.gz
+ source = ros-noetic-eigen-conversions-1.12.0.tar.gz::https://github.com/ros/geometry/archive/1.12.0.tar.gz
sha256sums = 61a278bdd50e00ea442055d9f70eaf82b5a36916739edca188fa1b71a59507b4
-pkgname = ros-melodic-eigen-conversions
+pkgname = ros-noetic-eigen-conversions
diff --git a/PKGBUILD b/PKGBUILD
index 2c4e5e82eac..301b933041d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgdesc="ROS - Conversion functions between: - Eigen and KDL - Eigen and geometry_msgs."
url='https://wiki.ros.org/eigen_conversions'
-pkgname='ros-melodic-eigen-conversions'
+pkgname='ros-noetic-eigen-conversions'
pkgver='1.12.0'
_pkgver_patch=0
arch=('any')
@@ -11,10 +11,10 @@ pkgrel=2
license=('BSD')
ros_makedepends=(
- ros-melodic-orocos-kdl
- ros-melodic-std-msgs
- ros-melodic-catkin
- ros-melodic-geometry-msgs
+ ros-noetic-orocos-kdl
+ ros-noetic-std-msgs
+ ros-noetic-catkin
+ ros-noetic-geometry-msgs
)
makedepends=(
@@ -25,9 +25,9 @@ makedepends=(
)
ros_depends=(
- ros-melodic-orocos-kdl
- ros-melodic-std-msgs
- ros-melodic-geometry-msgs
+ ros-noetic-orocos-kdl
+ ros-noetic-std-msgs
+ ros-noetic-geometry-msgs
)
depends=(
@@ -42,24 +42,17 @@ sha256sums=('61a278bdd50e00ea442055d9f70eaf82b5a36916739edca188fa1b71a59507b4')
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
}