[ros-diffs] [cwittich] 28859: fix linux build