summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2018-09-26 13:31:51 +0200
committerGonçalo Camelo Neves Pereira2018-09-26 13:31:51 +0200
commit0438bb854c492580b9647b3d744481453e33fbd4 (patch)
treeba372496282228560ae4acbbf42895514eb8991c
parent03037ff8b1b997e00476a1f922f6d874ce6003ba (diff)
downloadaur-0438bb854c492580b9647b3d744481453e33fbd4.tar.gz
Update
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD101
2 files changed, 47 insertions, 62 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 87cc6a0ca8f..8c20ef86f99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,12 +8,12 @@ pkgbase = ros-melodic-roscpp-core
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-melodic-catkin
- depends = ros-melodic-roscpp-serialization
- depends = ros-melodic-cpp-common
depends = ros-melodic-roscpp-traits
+ depends = ros-melodic-cpp-common
+ depends = ros-melodic-roscpp-serialization
depends = ros-melodic-rostime
- source = ros-melodic-roscpp-core::git+https://github.com/ros-gbp/roscpp_core-release.git
- sha256sums = SKIP
+ source = ros-melodic-roscpp-core-0.6.11-0.tar.gz::https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/roscpp_core/0.6.11-0.tar.gz
+ sha256sums = f195a1b5f4eccdfc3f0ffe2e409fff600f0d65eb9c3c9b158eea1604bbee0e2d
pkgname = ros-melodic-roscpp-core
diff --git a/PKGBUILD b/PKGBUILD
index c4b28dda607..8a812527049 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Script generated with import_catkin_packages.py.
-# For more information: https://github.com/bchretien/arch-ros-stacks.
+# Script generated with import_catkin_packages.py
+# For more information: https://github.com/bchretien/arch-ros-stacks
pkgdesc="ROS - Underlying data libraries for roscpp messages."
url='http://www.ros.org/wiki/roscpp_core'
@@ -10,68 +10,53 @@ arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(
- ros-melodic-catkin
-)
+ros_makedepends=(ros-melodic-catkin)
+makedepends=('cmake' 'ros-build-tools'
+ ${ros_makedepends[@]})
-makedepends=(
- 'cmake'
- 'ros-build-tools'
- ${ros_makedepends[@]}
-)
+ros_depends=(ros-melodic-roscpp-traits
+ ros-melodic-cpp-common
+ ros-melodic-roscpp-serialization
+ ros-melodic-rostime)
+depends=(${ros_depends[@]})
-ros_depends=(
- ros-melodic-roscpp-serialization
- ros-melodic-cpp-common
- ros-melodic-roscpp-traits
- ros-melodic-rostime
-)
+# Git version (e.g. for debugging)
+# _tag=release/melodic/roscpp_core/${pkgver}-${_pkgver_patch}
+# _dir=${pkgname}
+# source=("${_dir}"::"git+https://github.com/ros-gbp/roscpp_core-release.git"#tag=${_tag})
+# sha256sums=('SKIP')
-depends=(
- ${ros_depends[@]}
-)
-
-_dir=${pkgname}
-source=("${_dir}"::"git+https://github.com/ros-gbp/roscpp_core-release.git")
-sha256sums=('SKIP')
-
-prepare() {
- cd ${srcdir}/${_dir}
- git checkout upstream
- _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g')
-
- if [ -d ${_pkgname} ]; then
- git subtree split -P ${_pkgname} --branch ${_pkgname}
- git checkout ${_pkgname}
- fi
-}
+# Tarball version (faster download)
+_dir="roscpp_core-release-release-melodic-roscpp_core-${pkgver}-${_pkgver_patch}"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/roscpp_core/${pkgver}-${_pkgver_patch}.tar.gz")
+sha256sums=('f195a1b5f4eccdfc3f0ffe2e409fff600f0d65eb9c3c9b158eea1604bbee0e2d')
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
-
- # 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 \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
- make
+ # 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
+
+ # 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 \
+ -DSETUPTOOLS_DEB_LAYOUT=OFF
+ make
}
package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}/" install
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}/" install
}