diff options
author | Oskar Roesler | 2019-06-27 18:01:17 +0200 |
---|---|---|
committer | GitHub | 2019-06-27 18:01:17 +0200 |
commit | 6d5d027544466e50fd87150ae41a0edae24af264 (patch) | |
tree | 5905cd3616688851acb0d0ded67469cdab12feef | |
parent | 75ce05c6e98993eb63fc2326f6844dd929c52317 (diff) | |
parent | f7f0103bdaa40c7da5291558c45b4e7a2905e84d (diff) | |
download | aur-6d5d027544466e50fd87150ae41a0edae24af264.tar.gz |
Merge pull request #5 from acxz/master
Build fix for missing env variable QT_INSTALL_LIBS
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 11 |
2 files changed, 11 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-melodic-rviz pkgdesc = ROS - 3D visualization tool for ROS. pkgver = 1.13.3 - pkgrel = 1 + pkgrel = 2 url = http://ros.org/wiki/rviz arch = any license = BSD, Creative Commons @@ -6,7 +6,7 @@ url='http://ros.org/wiki/rviz' pkgname='ros-melodic-rviz' pkgver='1.13.3' arch=('any') -pkgrel=1 +pkgrel=2 license=('BSD, Creative Commons') ros_makedepends=( @@ -117,7 +117,16 @@ build() { -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ -DPYTHON_BASENAME=.cpython-37m \ -DSETUPTOOLS_DEB_LAYOUT=OFF + + make || { + # Replace $$[QT_INSTALL_LIBS] with hardcoded /usr/lib/ for proper linking + # Fix courtesy of astier: + # https://aur.archlinux.org/packages/ros-melodic-rviz/#comment-698298 + # Relevant upstream issue: + # https://github.com/ros-visualization/rviz/issues/1382 + sed -i 's/$$\[QT_INSTALL_LIBS\]/\/usr\/lib/' ${srcdir}/build/devel/bin/sip/rviz_sip/Makefile make + } } package() { |