diff options
author | acxz | 2020-05-24 11:38:23 -0400 |
---|---|---|
committer | acxz | 2020-05-24 11:38:23 -0400 |
commit | f463069b3f885eb8455a78a8c40a2f2819698c33 (patch) | |
tree | de306eb23ca89697d9dc05c0e9627152d7b8aff5 | |
parent | 2c3a517188434818ae5b112e094ea50bfbfaafd9 (diff) | |
download | aur-f463069b3f885eb8455a78a8c40a2f2819698c33.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 31 |
2 files changed, 22 insertions, 29 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-ecl-exceptions +pkgbase = ros-noetic-ecl-exceptions pkgdesc = ROS - Template based exceptions - these are simple and practical and avoid the proliferation of exception types. pkgver = 0.62.2 pkgrel = 1 @@ -7,15 +7,15 @@ pkgbase = ros-melodic-ecl-exceptions license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-ecl-license - makedepends = ros-melodic-ecl-errors - makedepends = ros-melodic-ecl-config - makedepends = ros-melodic-catkin - depends = ros-melodic-ecl-license - depends = ros-melodic-ecl-errors - depends = ros-melodic-ecl-config - source = ros-melodic-ecl-exceptions-0.62.2.tar.gz::https://github.com/stonier/ecl_core/archive/0.62.2.tar.gz + makedepends = ros-noetic-ecl-license + makedepends = ros-noetic-ecl-errors + makedepends = ros-noetic-ecl-config + makedepends = ros-noetic-catkin + depends = ros-noetic-ecl-license + depends = ros-noetic-ecl-errors + depends = ros-noetic-ecl-config + source = ros-noetic-ecl-exceptions-0.62.2.tar.gz::https://github.com/stonier/ecl_core/archive/0.62.2.tar.gz sha256sums = 69d503109878e3a2c4f5be611fc9609078714899cae15fbf7f58119fdbd61e37 -pkgname = ros-melodic-ecl-exceptions +pkgname = ros-noetic-ecl-exceptions @@ -2,26 +2,26 @@ pkgdesc="ROS - Template based exceptions - these are simple and practical and avoid the proliferation of exception types." url='https://wiki.ros.org/ecl_exceptions' -pkgname='ros-melodic-ecl-exceptions' +pkgname='ros-noetic-ecl-exceptions' pkgver='0.62.2' arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-ecl-license - ros-melodic-ecl-errors - ros-melodic-ecl-config - ros-melodic-catkin) +ros_makedepends=(ros-noetic-ecl-license + ros-noetic-ecl-errors + ros-noetic-ecl-config + ros-noetic-catkin) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]}) -ros_depends=(ros-melodic-ecl-license - ros-melodic-ecl-errors - ros-melodic-ecl-config) +ros_depends=(ros-noetic-ecl-license + ros-noetic-ecl-errors + ros-noetic-ecl-config) depends=(${ros_depends[@]}) # Git version (e.g. for debugging) -# _tag=release/melodic/ecl_exceptions/${pkgver}-${_pkgver_patch} +# _tag=release/noetic/ecl_exceptions/${pkgver}-${_pkgver_patch} # _dir=${pkgname} # source=("${_dir}"::"git+https://github.com/yujinrobot-release/ecl_core-release.git"#tag=${_tag}) # sha256sums=('SKIP') @@ -34,24 +34,17 @@ sha256sums=('69d503109878e3a2c4f5be611fc9609078714899cae15fbf7f58119fdbd61e37') 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 } |