diff options
| author | Franck Lucien Duriez | 2017-10-23 14:47:21 +0200 |
|---|---|---|
| committer | Franck Lucien Duriez | 2017-10-23 15:00:13 +0200 |
| commit | 58b353bcdbe6ddcd4fb0f4a054a0e88404d9fda8 (patch) | |
| tree | 7c183b3c9a37199d100e0fe4a9efe3ef100c83b2 | |
| parent | c69eb098f99e1c4d5076040272fc81429170a866 (diff) | |
| download | aur-58b353bcdbe6ddcd4fb0f4a054a0e88404d9fda8.tar.gz | |
Fix readv include bug.
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | readv.patch | 13 |
3 files changed, 28 insertions, 3 deletions
@@ -31,7 +31,9 @@ pkgbase = ros-indigo-roscpp depends = ros-indigo-rosgraph-msgs depends = ros-indigo-xmlrpcpp source = ros-indigo-roscpp-1.11.19-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roscpp/1.11.19-0.tar.gz + source = readv.patch sha256sums = b234e626e2013307ac8a456cbfa41a55e5d8e0e2c812431755828b29fee81255 + sha256sums = 06c2e8446233a55d8be74ea24f977af923038053cd02ed05118e89644358d845 pkgname = ros-indigo-roscpp @@ -44,17 +44,27 @@ depends=(${ros_depends[@]}) # Tarball version (faster download) _dir="ros_comm-release-release-indigo-roscpp-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roscpp/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('b234e626e2013307ac8a456cbfa41a55e5d8e0e2c812431755828b29fee81255') +source=( + "${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roscpp/${pkgver}-${_pkgver_patch}.tar.gz" + "readv.patch" +) +sha256sums=( + 'b234e626e2013307ac8a456cbfa41a55e5d8e0e2c812431755828b29fee81255' + '06c2e8446233a55d8be74ea24f977af923038053cd02ed05118e89644358d845' +) build() { # Use ROS environment variables source /usr/share/ros-build-tools/clear-ros-env.sh [ -f /opt/ros/indigo/setup.bash ] && source /opt/ros/indigo/setup.bash + # Apply patch + cd "${srcdir}/${_dir}" + patch -p1 -i "${srcdir}"/readv.patch + # Create build directory [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + cd "${srcdir}/build" # Fix Python2/Python3 conflicts /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir} diff --git a/readv.patch b/readv.patch new file mode 100644 index 000000000000..27dd29990ec0 --- /dev/null +++ b/readv.patch @@ -0,0 +1,13 @@ +diff --git a/src/libros/transport/transport_udp.cpp b/src/libros/transport/transport_udp.cpp +index 848893b..2cc3d7f 100644 +--- a/src/libros/transport/transport_udp.cpp ++++ b/src/libros/transport/transport_udp.cpp +@@ -40,7 +40,7 @@ + #include <boost/bind.hpp> + + #include <fcntl.h> +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__linux__) + // For readv() and writev() + #include <sys/types.h> + #include <sys/uio.h> |