summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2015-06-19 00:13:33 +0900
committerBenjamin Chrétien2015-06-19 00:13:33 +0900
commit23cf1f2b5df2737b272946291295783b13e8ede3 (patch)
tree68a80f114763e2bc946155adefa99d2d5d247ef6
parent697bec7deedfe25b08e504c31946ba2a8765010d (diff)
downloadaur-ros-jade-ros-core.tar.gz
jade/ros_core: remove roslisp dependency on ARM (until confirmed it works)
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5d1e05f488c..dd81b5dc09be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,7 +26,6 @@ pkgbase = ros-jade-ros-core
depends = ros-jade-ros
depends = ros-jade-genlisp
depends = ros-jade-ros-comm
- depends = ros-jade-roslisp
depends = ros-jade-message-runtime
depends = ros-jade-rosbag-migration-rule
source = ros_core::git+https://github.com/ros-gbp/metapackages-release.git#tag=release/jade/ros_core/1.2.0-0
diff --git a/PKGBUILD b/PKGBUILD
index 3a754172b7d3..6001b1d0a789 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,11 +31,15 @@ ros_depends=(ros-jade-std-srvs
ros-jade-ros
ros-jade-genlisp
ros-jade-ros-comm
- ros-jade-roslisp
ros-jade-message-runtime
ros-jade-rosbag-migration-rule)
depends=(${ros_depends[@]})
+# roslisp cannot be installed on ARM
+if test "$CARCH" == x86_64 || test "$CARCH" == i686 ; then
+ ros_depends+=('ros-jade-roslisp')
+fi
+
_tag=release/jade/ros_core/${pkgver}-${_pkgver_patch}
_dir=ros_core
source=("${_dir}"::"git+https://github.com/ros-gbp/metapackages-release.git"#tag=${_tag})