forked from ros/meta-ros
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ok, catkin is working now. Fixes #17.
- Loading branch information
Showing
5 changed files
with
37 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,6 @@ | ||
DEPENDS = "cmake ${PYTHON_PN}-empy-native ${PYTHON_PN}-catkin-pkg-native" | ||
|
||
SRC_URI += "\ | ||
file://0001-Duplicate-changes-for-newer-catkin-releases.patch \ | ||
file://0001-avoid-using-host-s-paths-when-cross-compiling.patch" | ||
file://0001-avoid-using-host-s-paths-when-cross-compiling.patch \ | ||
file://0001-Force-python-2.patch" | ||
|
||
inherit catkin | ||
|
||
# FILES_${PN} += "\ | ||
# ${ros_datadir}/eigen/cmake \ | ||
# ${ros_datadir}/ros/cmake \ | ||
# ${ros_datadir}/.catkin \ | ||
# ${ros_prefix}/.catkin \ | ||
# ${ros_prefix}/.rosinstall \ | ||
# ${ros_prefix}/_setup_util.py \ | ||
# ${ros_prefix}/env.sh \ | ||
# ${ros_prefix}/setup.* \ | ||
# " |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From 6e50366f6353aef8efc3480772051401b346d088 Mon Sep 17 00:00:00 2001 | ||
From: "Hunter L. Allen" <[email protected]> | ||
Date: Mon, 18 Dec 2017 14:55:50 -0500 | ||
Subject: [PATCH] Force python 2. | ||
|
||
--- | ||
cmake/templates/_setup_util.py.in | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/cmake/templates/_setup_util.py.in b/cmake/templates/_setup_util.py.in | ||
index 106507a..bd85ac1 100755 | ||
--- a/cmake/templates/_setup_util.py.in | ||
+++ b/cmake/templates/_setup_util.py.in | ||
@@ -1,4 +1,4 @@ | ||
-#!@PYTHON_EXECUTABLE@ | ||
+#!/usr/bin/python2.7 | ||
# -*- coding: utf-8 -*- | ||
|
||
# Software License Agreement (BSD License) | ||
-- | ||
2.7.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters