summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Greenslade2017-09-10 11:13:05 -0700
committerSean Greenslade2017-09-10 11:14:31 -0700
commit8d14e1ecb867ec9ee0fce6bfd8170ca3a23f8bed (patch)
treec0dbe4e80cf40661b61d08af2948970f3e771f9c
parentde321f50100c4ad0e938adf06fdf8e8e02a2b965 (diff)
downloadaur-8d14e1ecb867ec9ee0fce6bfd8170ca3a23f8bed.tar.gz
Patch for gcc build.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--uio.patch12
3 files changed, 26 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 88388aecc68..d933c724408 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Apr 7 00:06:20 UTC 2017
+# Sun Sep 10 18:13:05 UTC 2017
pkgbase = ros-kinetic-roscpp
pkgdesc = ROS - roscpp is a C++ implementation of ROS.
pkgver = 1.12.7
- pkgrel = 1
+ pkgrel = 2
url = http://ros.org/wiki/roscpp
arch = any
license = BSD
@@ -31,7 +31,9 @@ pkgbase = ros-kinetic-roscpp
depends = ros-kinetic-rosgraph-msgs
depends = ros-kinetic-rosconsole
source = ros-kinetic-roscpp-1.12.7-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/kinetic/roscpp/1.12.7-0.tar.gz
+ source = uio.patch
sha256sums = 4fa71a99805a5cfb30b86c95a2bcab5d0f9816e7d5560733cdfdaf81d9787bab
+ sha256sums = 9e5b8c7358c7cda5dda8de4f7fac75c64866b946ecebf4c3a03ca9f198ccc06b
pkgname = ros-kinetic-roscpp
diff --git a/PKGBUILD b/PKGBUILD
index 5ebce173697..000099070d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-kinetic-roscpp'
pkgver='1.12.7'
_pkgver_patch=0
arch=('any')
-pkgrel=1
+pkgrel=2
license=('BSD')
ros_makedepends=(ros-kinetic-roscpp-traits
@@ -44,8 +44,15 @@ depends=(${ros_depends[@]})
# Tarball version (faster download)
_dir="ros_comm-release-release-kinetic-roscpp-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/kinetic/roscpp/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('4fa71a99805a5cfb30b86c95a2bcab5d0f9816e7d5560733cdfdaf81d9787bab')
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/kinetic/roscpp/${pkgver}-${_pkgver_patch}.tar.gz"
+ uio.patch)
+sha256sums=('4fa71a99805a5cfb30b86c95a2bcab5d0f9816e7d5560733cdfdaf81d9787bab'
+ '9e5b8c7358c7cda5dda8de4f7fac75c64866b946ecebf4c3a03ca9f198ccc06b')
+
+prepare() {
+ cd ${srcdir}
+ patch -p1 < uio.patch
+}
build() {
# Use ROS environment variables
diff --git a/uio.patch b/uio.patch
new file mode 100644
index 00000000000..2b2226acf1a
--- /dev/null
+++ b/uio.patch
@@ -0,0 +1,12 @@
+--- a/ros_comm-release-release-kinetic-roscpp-1.12.7-0/src/libros/transport/transport_udp.cpp 2017-02-17 18:32:58.000000000 -0800
++++ b/ros_comm-release-release-kinetic-roscpp-1.12.7-0/src/libros/transport/transport_udp.cpp 2017-09-10 11:08:47.272993825 -0700
+@@ -48,6 +48,9 @@
+ #elif defined(__ANDROID__)
+ // For readv() and writev() on ANDROID
+ #include <sys/uio.h>
++#elif defined(_POSIX_VERSION)
++ // For readv() and writev()
++ #include <sys/uio.h>
+ #endif
+
+ namespace ros