summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD32
2 files changed, 5 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f6cced00d19..af22ff5497b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:38:59 UTC 2017
+# Thu Dec 21 22:29:46 UTC 2017
pkgbase = ros-ardent-ament-pyflakes
pkgdesc = ROS - The ability to check code using pyflakes and generate xUnit test result files.
pkgver = 0.4.0
@@ -9,7 +9,7 @@ pkgbase = ros-ardent-ament-pyflakes
license = Apache License 2.0
makedepends = cmake
makedepends = ros-build-tools
- depends = pyflakes3
+ depends = python-pyflakes
source = ros-ardent-ament-pyflakes-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ament_lint-release/archive/release/ardent/ament_pyflakes/0.4.0-0.tar.gz
sha256sums = dc89b21035dd52cbeb6c99074a120db374228daaa452926e932000c08cc8f874
diff --git a/PKGBUILD b/PKGBUILD
index 7b8743362c5..a47563b8311 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ makedepends=('cmake' 'ros-build-tools'
ros_depends=()
depends=(${ros_depends[@]}
- pyflakes3)
+ python-pyflakes)
# Git version (e.g. for debugging)
# _tag=release/ardent/ament_pyflakes/${pkgver}-${_pkgver_patch}
@@ -29,33 +29,7 @@ _dir="ament_lint-release-release-ardent-ament_pyflakes-${pkgver}-${_pkgver_patch
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/ament_lint-release/archive/release/ardent/ament_pyflakes/${pkgver}-${_pkgver_patch}.tar.gz")
sha256sums=('dc89b21035dd52cbeb6c99074a120db374228daaa452926e932000c08cc8f874')
-build() {
- # Use ROS environment variables
- source /usr/share/ros-build-tools/clear-ros-env.sh
- [ -f /opt/ros/ardent/setup.bash ] && source /opt/ros/ardent/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/ardent \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \
- -DPYTHON_BASENAME=.cpython-35m \
- -DSETUPTOOLS_DEB_LAYOUT=OFF \
- -DCATKIN_ENABLE_TESTING=OFF
- make
-}
-
package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}/" install
+ cd "${srcdir}/${_dir}"
+ python setup.py install --root="$pkgdir" --prefix="/opt/ros/ardent" --optimize=1
}