upd to noetic, cmake vars, python

1 files changed, 18 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bef5e6c0b797..9b2b1613eefb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - A metapackage which extends ros_base and includes ROS libaries for any robot hardware."
 url='https://wiki.ros.org/robot'
 
-pkgname='ros-melodic-robot'
+pkgname='ros-noetic-robot'
 pkgver='1.4.1'
 _pkgver_patch=0
 arch=('any')
@@ -11,7 +11,7 @@ pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -21,19 +21,19 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-filters
-	ros-melodic-ros-base
-	ros-melodic-joint-state-publisher
-	ros-melodic-executive-smach
-	ros-melodic-urdf-parser-plugin
-	ros-melodic-xacro
-	ros-melodic-diagnostics
-	ros-melodic-robot-state-publisher
-	ros-melodic-kdl-parser-py
-	ros-melodic-geometry
-	ros-melodic-urdf
-	ros-melodic-control-msgs
-	ros-melodic-kdl-parser
+	ros-noetic-filters
+	ros-noetic-ros-base
+	ros-noetic-joint-state-publisher
+	ros-noetic-executive-smach
+	ros-noetic-urdf-parser-plugin
+	ros-noetic-xacro
+	ros-noetic-diagnostics
+	ros-noetic-robot-state-publisher
+	ros-noetic-kdl-parser-py
+	ros-noetic-geometry
+	ros-noetic-urdf
+	ros-noetic-control-msgs
+	ros-noetic-kdl-parser
 )
 
 depends=(
@@ -47,24 +47,17 @@ sha256sums=('ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1')
 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
 }