upd to noetic, cmake vars, python

2 files changed, 11 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23c0c3ac1595..156bf39b748b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-eigen-stl-containers
+pkgbase = ros-noetic-eigen-stl-containers
 	pkgdesc = ROS - This package provides a set of typedefs that allow using Eigen datatypes in STL containers.
 	pkgver = 0.1.8
 	pkgrel = 3
@@ -7,12 +7,12 @@ pkgbase = ros-melodic-eigen-stl-containers
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-cmake-modules
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-cmake-modules
 	makedepends = eigen3
 	depends = eigen3
-	source = ros-melodic-eigen-stl-containers-0.1.8.tar.gz::https://github.com/ros/eigen_stl_containers/archive/0.1.8.tar.gz
+	source = ros-noetic-eigen-stl-containers-0.1.8.tar.gz::https://github.com/ros/eigen_stl_containers/archive/0.1.8.tar.gz
 	sha256sums = cf1bcd3253aff0eb032f6d74b9b3c322c99f75ee66bd7034daee8bb2d2a422fc
 
-pkgname = ros-melodic-eigen-stl-containers
+pkgname = ros-noetic-eigen-stl-containers
 
diff --git a/PKGBUILD b/PKGBUILD
index 9c7bc1ac13a8..d61bd6964296 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgdesc="ROS - This package provides a set of typedefs that allow using Eigen datatypes in STL containers."
 url='http://eigen.tuxfamily.org/dox/TopicUnalignedArrayAssert.html'
 
-pkgname='ros-melodic-eigen-stl-containers'
+pkgname='ros-noetic-eigen-stl-containers'
 pkgver='0.1.8'
 arch=('any')
 pkgrel=3
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin
-  ros-melodic-cmake-modules)
+ros_makedepends=(ros-noetic-catkin
+  ros-noetic-cmake-modules)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   eigen3)
@@ -26,24 +26,17 @@ sha256sums=('cf1bcd3253aff0eb032f6d74b9b3c322c99f75ee66bd7034daee8bb2d2a422fc')
 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
 }