diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 19 |
2 files changed, 10 insertions, 17 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-ecl-license +pkgbase = ros-noetic-ecl-license pkgdesc = ROS - Maintains the ecl licenses and also provides an install target for deploying licenses with the ecl libraries. pkgver = 0.61.8 pkgrel = 1 @@ -7,9 +7,9 @@ pkgbase = ros-melodic-ecl-license license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - source = ros-melodic-ecl-license-0.61.8.tar.gz::https://github.com/stonier/ecl_tools/archive/0.61.8.tar.gz + makedepends = ros-noetic-catkin + source = ros-noetic-ecl-license-0.61.8.tar.gz::https://github.com/stonier/ecl_tools/archive/0.61.8.tar.gz sha256sums = 3c7f16efaae81db62dd482b35c60b25bfaa5fed52112347ecaf97a8d10b445f6 -pkgname = ros-melodic-ecl-license +pkgname = ros-noetic-ecl-license @@ -2,13 +2,13 @@ pkgdesc="ROS - Maintains the ecl licenses and also provides an install target for deploying licenses with the ecl libraries." url='https://wiki.ros.org/ecl_license' -pkgname='ros-melodic-ecl-license' +pkgname='ros-noetic-ecl-license' pkgver='0.61.8' arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin) +ros_makedepends=(ros-noetic-catkin) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]}) @@ -16,7 +16,7 @@ ros_depends=() depends=(${ros_depends[@]}) # Git version (e.g. for debugging) -# _tag=release/melodic/ecl_license/${pkgver}-${_pkgver_patch} +# _tag=release/noetic/ecl_license/${pkgver}-${_pkgver_patch} # _dir=${pkgname} # source=("${_dir}"::"git+https://github.com/yujinrobot-release/ecl_tools-release.git"#tag=${_tag}) # sha256sums=('SKIP') @@ -29,24 +29,17 @@ sha256sums=('3c7f16efaae81db62dd482b35c60b25bfaa5fed52112347ecaf97a8d10b445f6') 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 } |