commit: d7ec0073babe92e009f018d45b40eb3940ae351b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Apr 6 02:49:05 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 6 18:18:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ec0073
dev-ros/urg_node: move CMAKE_MAKEFILE_GENERATOR to pre-inherit Marked as @PRE_INHERIT within cmake.eclass because it manipulates dependencies in global scope. Signed-off-by: Sam James <sam <AT> gentoo.org> dev-ros/urg_node/urg_node-0.1.15.ebuild | 5 ++--- dev-ros/urg_node/urg_node-9999.ebuild | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dev-ros/urg_node/urg_node-0.1.15.ebuild b/dev-ros/urg_node/urg_node-0.1.15.ebuild index 985c4cbd04c..0b173d1c9c2 100644 --- a/dev-ros/urg_node/urg_node-0.1.15.ebuild +++ b/dev-ros/urg_node/urg_node-0.1.15.ebuild @@ -6,6 +6,8 @@ ROS_REPO_URI="https://github.com/ros-drivers/urg_node"; KEYWORDS="~amd64 ~arm" CATKIN_HAS_MESSAGES=yes +# https://bugs.gentoo.org/735106 +CMAKE_MAKEFILE_GENERATOR=emake inherit ros-catkin DESCRIPTION="ROS wrapper for the Hokuyo urg_c library" @@ -32,6 +34,3 @@ DEPEND="${RDEPEND} dev-ros/roslaunch ) " - -# https://bugs.gentoo.org/735106 -CMAKE_MAKEFILE_GENERATOR=emake diff --git a/dev-ros/urg_node/urg_node-9999.ebuild b/dev-ros/urg_node/urg_node-9999.ebuild index cd680c30f62..0b173d1c9c2 100644 --- a/dev-ros/urg_node/urg_node-9999.ebuild +++ b/dev-ros/urg_node/urg_node-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,6 +6,8 @@ ROS_REPO_URI="https://github.com/ros-drivers/urg_node"; KEYWORDS="~amd64 ~arm" CATKIN_HAS_MESSAGES=yes +# https://bugs.gentoo.org/735106 +CMAKE_MAKEFILE_GENERATOR=emake inherit ros-catkin DESCRIPTION="ROS wrapper for the Hokuyo urg_c library" @@ -32,6 +34,3 @@ DEPEND="${RDEPEND} dev-ros/roslaunch ) " - -# https://bugs.gentoo.org/735106 -CMAKE_MAKEFILE_GENERATOR=emake
