[wip/ros18-base] Define PYTHON_EXECUTABLE et al. in Makefile.common

Make sure to pass all variables defining the proper python version as found by
robotpkg, otherwise ros CMakeFiles may happily find python-3.2 and use it
instead of python<3, although this does not work in the end (at least ros-rx
does this and breaks on F17).

This is done in the common ros Makefile as this affects all packages.

catkin/Makefile

@@ -28,8 +28,6 @@ SUBST_CLASSES+=			bash-interp
 SUBST_FILES.bash-interp+=	bin/git-catkin
 SUBST_FILES.bash-interp+=	bin/git-catkin-track-all
 
-DEPEND_ABI.python=	python<3
-
 include ../../wip/py-rospkg/depend.mk
 include ../../mk/sysdep/bash.mk
 include ../../mk/sysdep/cmake.mk
@@ -39,5 +37,4 @@ include ../../mk/sysdep/py-argparse.mk
 include ../../mk/sysdep/py-empy.mk
 include ../../mk/sysdep/py-nose.mk
 include ../../mk/sysdep/py-yaml.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

py-rospkg/Makefile

@@ -14,17 +14,16 @@ HOMEPAGE=		http://ros.org/wiki/rospkg
 
 WRKSRC=			${WRKDIR}/ros-rospkg-${COMMIT}
 
-include ../../wip/ros18-base/Makefile.common
-
 USE_LANGUAGES=
 CONFLICTS+=		py[0-9][0-9]-rospkg-${VERSION}
 
+PYDISTUTILSPKG=		yes
+
+include ../../wip/ros18-base/Makefile.common
+
 SUBST_CLASSES+=		py-syspath py-interp
 SUBST_FILES.py-syspath+=scripts/rosversion
 SUBST_FILES.py-interp+=	scripts/rosversion
 
-PYDISTUTILSPKG=		yes
-DEPEND_ABI.python=	python<3
-
 include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-actionlib/Makefile

@@ -19,5 +19,4 @@ include ../../wip/ros-genmsg/depend.mk
 include ../../wip/ros-langs/depend.mk
 include ../../wip/ros-core/depend.mk
 include ../../wip/ros-comm/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-comm/Makefile

@@ -28,5 +28,4 @@ include ../../wip/roscpp-core/depend.mk
 include ../../mk/sysdep/apr.mk
 include ../../mk/sysdep/py-paramiko.mk
 include ../../mk/sysdep/py-yaml.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-common-msgs/Makefile

@@ -21,5 +21,4 @@ include ../../wip/catkin/depend.mk
 include ../../wip/ros-genmsg/depend.mk
 include ../../wip/ros-langs/depend.mk
 include ../../wip/ros-std-msgs/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-core/Makefile

@@ -22,6 +22,5 @@ include ../../devel/boost-libs/depend.mk
 include ../../wip/catkin/depend.mk
 include ../../wip/rospack/depend.mk
 include ../../wip/py-rospkg/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/sysdep/py-nose.mk
 include ../../mk/robotpkg.mk

ros-gencpp/Makefile

@@ -15,5 +15,4 @@ SUBST_CLASSES+=		py-distsetup
 
 include ../../wip/catkin/depend.mk
 include ../../wip/ros-genmsg/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-genlisp/Makefile

@@ -15,5 +15,4 @@ SUBST_CLASSES+=		py-distsetup
 
 include ../../wip/catkin/depend.mk
 include ../../wip/ros-genmsg/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-genmsg/Makefile

@@ -12,5 +12,4 @@ HOMEPAGE=		http://www.ros.org/wiki/genmsg
 include ../../wip/ros18-base/Makefile.common
 
 include ../../wip/catkin/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-genpy/Makefile

@@ -15,5 +15,4 @@ SUBST_CLASSES+=		py-distsetup
 
 include ../../wip/catkin/depend.mk
 include ../../wip/ros-genmsg/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-langs-dev/Makefile

@@ -15,5 +15,4 @@ include ../../wip/catkin/depend.mk
 include ../../wip/ros-gencpp/depend.mk
 include ../../wip/ros-genpy/depend.mk
 include ../../wip/ros-genlisp/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-langs/Makefile

@@ -14,5 +14,4 @@ include ../../wip/ros18-base/Makefile.common
 include ../../wip/catkin/depend.mk
 include ../../wip/roscpp-core/depend.mk
 include ../../wip/ros-langs-dev/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros-rx/Makefile

@@ -20,6 +20,5 @@ include ../../wip/rospack/depend.mk
 include ../../mk/sysdep/graphviz.mk
 include ../../mk/sysdep/py-matplotlib.mk
 include ../../mk/sysdep/py-wxpython.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/sysdep/wxwidgets.mk
 include ../../mk/robotpkg.mk

ros-std-msgs/Makefile

@@ -15,5 +15,4 @@ include ../../pkgtools/pkg-config/depend.mk
 include ../../wip/catkin/depend.mk
 include ../../wip/ros-genmsg/depend.mk
 include ../../wip/ros-langs/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk

ros18-base/Makefile.common

@@ -23,6 +23,17 @@ WRKSRC?=	${WRKDIR}/${ROS_PKGURL}-${ROS_VERSION}
 USE_LANGUAGES?=	c c++
 
 
+# --- common dependencies --------------------------------------------------
+#
+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON}
+CMAKE_ARGS+=	-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE}
+CMAKE_ARGS+=	-DPYTHON_LIBRARY=${PYTHON_LIB}
+
+DEPEND_ABI.python+=	python<3
+
+include ../../mk/sysdep/python.mk
+
+
 # --- replace interpreters -------------------------------------------------
 #
 # These targets can be enabled by defining SUBST_CLASSES and SUBST_FILES

rospack/Makefile

@@ -15,7 +15,6 @@ include ../../wip/ros18-base/Makefile.common
 include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk
 include ../../wip/catkin/depend.mk
-include ../../mk/sysdep/python.mk
 include ../../mk/sysdep/py-nose.mk
 include ../../mk/sysdep/googletest.mk
 include ../../mk/robotpkg.mk