upd to noetic, cmake vars, python

1 files changed, 11 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6d5874f82f4d..4c08a8e7dd4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,15 @@ pkgdesc="ROS - Small lib to transform sensor_msgs with tf. Most notably,
 PointCloud2"
 url='https://wiki.ros.org/tf2_sensor_msgs'
 
-pkgname='ros-melodic-tf2-sensor-msgs'
+pkgname='ros-noetic-tf2-sensor-msgs'
 pkgver='0.6.5'
 arch=('any')
 pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
-  ros-melodic-catkin
-  ros-melodic-cmake-modules
+  ros-noetic-catkin
+  ros-noetic-cmake-modules
 )
 
 makedepends=(
@@ -23,11 +23,11 @@ makedepends=(
 )
 
 ros_depends=(
-  ros-melodic-sensor-msgs
-  ros-melodic-tf2
-  ros-melodic-tf2-ros
-  ros-melodic-python-orocos-kdl
-  ros-melodic-rospy
+  ros-noetic-sensor-msgs
+  ros-noetic-tf2
+  ros-noetic-tf2-ros
+  ros-noetic-python-orocos-kdl
+  ros-noetic-rospy
 )
 
 depends=(
@@ -41,24 +41,17 @@ sha256sums=('9a1268621518fc22afd7b12ef1cf30e6901a57b054535924d1d74fd5d267773a')
 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=.cpython-37m \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }