| 1 |
commit: df81a0104c301303b0a7c2f4ea1d74dcb9e6a699 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 23 09:06:23 2022 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 23 11:10:32 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df81a010 |
| 7 |
|
| 8 |
dev-ros/ament_cmake_core: use unversionned python when building for gentoo |
| 9 |
|
| 10 |
this honours EPYTHON |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 13 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 14 |
|
| 15 |
..._core-9999.ebuild => ament_cmake_core-1.3.0-r1.ebuild} | 3 ++- |
| 16 |
dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild | 3 ++- |
| 17 |
dev-ros/ament_cmake_core/files/findpython.patch | 15 +++++++++++++++ |
| 18 |
3 files changed, 19 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild |
| 21 |
similarity index 92% |
| 22 |
copy from dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild |
| 23 |
copy to dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild |
| 24 |
index 0bc79bd3fd0c..3e96c689fcb9 100644 |
| 25 |
--- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild |
| 26 |
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild |
| 27 |
@@ -1,4 +1,4 @@ |
| 28 |
-# Copyright 2019-2021 Gentoo Authors |
| 29 |
+# Copyright 2019-2022 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
EAPI=7 |
| 33 |
@@ -29,6 +29,7 @@ else |
| 34 |
KEYWORDS="~amd64" |
| 35 |
fi |
| 36 |
IUSE="" |
| 37 |
+PATCHES=( "${FILESDIR}/findpython.patch" ) |
| 38 |
|
| 39 |
RDEPEND=" |
| 40 |
dev-python/ament_package |
| 41 |
|
| 42 |
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild |
| 43 |
index 0bc79bd3fd0c..3e96c689fcb9 100644 |
| 44 |
--- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild |
| 45 |
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild |
| 46 |
@@ -1,4 +1,4 @@ |
| 47 |
-# Copyright 2019-2021 Gentoo Authors |
| 48 |
+# Copyright 2019-2022 Gentoo Authors |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
|
| 51 |
EAPI=7 |
| 52 |
@@ -29,6 +29,7 @@ else |
| 53 |
KEYWORDS="~amd64" |
| 54 |
fi |
| 55 |
IUSE="" |
| 56 |
+PATCHES=( "${FILESDIR}/findpython.patch" ) |
| 57 |
|
| 58 |
RDEPEND=" |
| 59 |
dev-python/ament_package |
| 60 |
|
| 61 |
diff --git a/dev-ros/ament_cmake_core/files/findpython.patch b/dev-ros/ament_cmake_core/files/findpython.patch |
| 62 |
new file mode 100644 |
| 63 |
index 000000000000..790b0631b82c |
| 64 |
--- /dev/null |
| 65 |
+++ b/dev-ros/ament_cmake_core/files/findpython.patch |
| 66 |
@@ -0,0 +1,15 @@ |
| 67 |
+Index: ament_cmake_core/cmake/core/python.cmake |
| 68 |
+=================================================================== |
| 69 |
+--- ament_cmake_core.orig/cmake/core/python.cmake |
| 70 |
++++ ament_cmake_core/cmake/core/python.cmake |
| 71 |
+@@ -17,6 +17,10 @@ |
| 72 |
+ # Example: |
| 73 |
+ # find_package(Python3 3.8 REQUIRED) |
| 74 |
+ # find_package(ament_cmake REQUIRED) |
| 75 |
++ |
| 76 |
++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo) |
| 77 |
++ set(Python3_FIND_UNVERSIONED_NAMES FIRST) |
| 78 |
++endif() |
| 79 |
+ if(NOT TARGET Python3::Interpreter) |
| 80 |
+ find_package(Python3 REQUIRED COMPONENTS Interpreter) |
| 81 |
+ endif() |
Archives